diff --git a/service/config/sample.yml b/service/config/sample.yml index bbc4bdd20..0c8cdebe2 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -221,9 +221,6 @@ messageCache: # Redis server configuration for message store cache cluster: configurationUri: redis://redis.example.com:6379/ -metricsCluster: - configurationUri: redis://redis.example.com:6379/ - awsAttachments: # AWS S3 configuration bucket: aws-attachments credentials: diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index 7d8d42b6d..f25f513e4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -128,11 +128,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private FaultTolerantRedisClusterFactory cacheCluster; - @NotNull - @Valid - @JsonProperty - private FaultTolerantRedisClusterFactory metricsCluster; - @NotNull @Valid @JsonProperty @@ -399,11 +394,6 @@ public class WhisperServerConfiguration extends Configuration { return provisioning; } - public FaultTolerantRedisClusterFactory getMetricsClusterConfiguration() { - return metricsCluster; - } - - public SecureValueRecovery2Configuration getSvr2Configuration() { return svr2; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index b400766ba..e058ca917 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -462,8 +462,6 @@ public class WhisperServerService extends Application