MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove configuration for no-longer-used "metrics" redis cluster

This commit is contained in:
Jonathan Klabunde Tomer 2024-08-21 14:49:05 -07:00 committed by GitHub
parent 9eafa118d5
commit a049eda7e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/config/sample.yml
View File

@ -221,9 +221,6 @@ messageCache: # Redis server configuration for message store cache
cluster: cluster:
configurationUri: redis://redis.example.com:6379/ configurationUri: redis://redis.example.com:6379/
metricsCluster:
configurationUri: redis://redis.example.com:6379/
awsAttachments: # AWS S3 configuration awsAttachments: # AWS S3 configuration
bucket: aws-attachments bucket: aws-attachments
credentials: credentials:

10
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
View File

@ -128,11 +128,6 @@ public class WhisperServerConfiguration extends Configuration {
@JsonProperty @JsonProperty
private FaultTolerantRedisClusterFactory cacheCluster; private FaultTolerantRedisClusterFactory cacheCluster;
@NotNull
@Valid
@JsonProperty
private FaultTolerantRedisClusterFactory metricsCluster;
@NotNull @NotNull
@Valid @Valid
@JsonProperty @JsonProperty
@ -399,11 +394,6 @@ public class WhisperServerConfiguration extends Configuration {
return provisioning; return provisioning;
} }
public FaultTolerantRedisClusterFactory getMetricsClusterConfiguration() {
return metricsCluster;
}
public SecureValueRecovery2Configuration getSvr2Configuration() { public SecureValueRecovery2Configuration getSvr2Configuration() {
return svr2; return svr2;
} }

2
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -462,8 +462,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
.build("messages", sharedClientResources.mutate()); .build("messages", sharedClientResources.mutate());
FaultTolerantRedisCluster clientPresenceCluster = config.getClientPresenceClusterConfiguration() FaultTolerantRedisCluster clientPresenceCluster = config.getClientPresenceClusterConfiguration()
.build("client_presence", sharedClientResources.mutate()); .build("client_presence", sharedClientResources.mutate());
FaultTolerantRedisCluster metricsCluster = config.getMetricsClusterConfiguration()
.build("metrics", sharedClientResources.mutate());
FaultTolerantRedisCluster pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler", FaultTolerantRedisCluster pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler",
sharedClientResources.mutate()); sharedClientResources.mutate());
FaultTolerantRedisCluster rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters", FaultTolerantRedisCluster rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters",

3
service/src/test/resources/config/test.yml
View File

@ -216,9 +216,6 @@ messageCache: # Redis server configuration for message store cache
cluster: cluster:
type: local type: local
metricsCluster:
type: local
awsAttachments: # AWS S3 configuration awsAttachments: # AWS S3 configuration
bucket: aws-attachments bucket: aws-attachments
credentials: credentials: