diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index d5f39b81a..b021aabfe 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -92,7 +92,6 @@ import org.whispersystems.textsecuregcm.metrics.FreeMemoryGauge; import org.whispersystems.textsecuregcm.metrics.GarbageCollectionGauges; import org.whispersystems.textsecuregcm.metrics.MaxFileDescriptorGauge; import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener; -import org.whispersystems.textsecuregcm.metrics.MicrometerLettuceCommandLatencyRecorder; import org.whispersystems.textsecuregcm.metrics.NetworkReceivedGauge; import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge; import org.whispersystems.textsecuregcm.metrics.OperatingSystemMemoryGauge; @@ -109,6 +108,7 @@ import org.whispersystems.textsecuregcm.push.ProvisioningManager; import org.whispersystems.textsecuregcm.push.MessageSender; import org.whispersystems.textsecuregcm.push.ReceiptSender; import org.whispersystems.textsecuregcm.recaptcha.RecaptchaClient; +import org.whispersystems.textsecuregcm.redis.ConnectionEventLogger; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool; import org.whispersystems.textsecuregcm.s3.PolicySigner; @@ -291,6 +291,7 @@ public class WhisperServerService extends Application { + if (event instanceof ConnectionEvent) { + logger.info("Connection event: {}", event); + } else if (event instanceof ClusterTopologyChangedEvent) { + logger.info("Cluster topology changed: {}", event); + } + }); + } +} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java index 5c76fef29..58b35c9e6 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java @@ -63,14 +63,6 @@ public class FaultTolerantRedisCluster { this.clusterClient = clusterClient; this.clusterClient.setDefaultTimeout(commandTimeout); - this.clusterClient.getResources().eventBus().get().subscribe(event -> { - if (event instanceof ConnectionEvent) { - log.info("Connection event for {}: {}", this.name, event); - } else if (event instanceof ClusterTopologyChangedEvent) { - log.info("Cluster topology for {} changed: {}", this.name, event); - } - }); - this.stringConnection = clusterClient.connect(); this.binaryConnection = clusterClient.connect(ByteArrayCodec.INSTANCE);