diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java index db08d8c44..fcd0dd31f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java @@ -10,7 +10,6 @@ import io.lettuce.core.RedisCommandTimeoutException; import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.whispersystems.textsecuregcm.util.CircuitBreakerUtil; import org.whispersystems.textsecuregcm.util.Constants; import java.util.function.Consumer; @@ -20,6 +19,8 @@ import static com.codahale.metrics.MetricRegistry.name; public class FaultTolerantPubSubConnection { + private final String name; + private final StatefulRedisClusterPubSubConnection pubSubConnection; private final CircuitBreaker circuitBreaker; @@ -31,6 +32,7 @@ public class FaultTolerantPubSubConnection { private static final Logger log = LoggerFactory.getLogger(FaultTolerantPubSubConnection.class); public FaultTolerantPubSubConnection(final String name, final StatefulRedisClusterPubSubConnection pubSubConnection, final CircuitBreaker circuitBreaker, final Retry retry) { + this.name = name; this.pubSubConnection = pubSubConnection; this.circuitBreaker = circuitBreaker; this.retry = retry; @@ -50,6 +52,7 @@ public class FaultTolerantPubSubConnection { consumer.accept(pubSubConnection); } catch (final RedisCommandTimeoutException e) { commandTimeoutMeter.mark(); + log.warn("Command timeout exception ({}-pubsub)", this.name, e); throw e; } })); @@ -71,6 +74,7 @@ public class FaultTolerantPubSubConnection { return function.apply(pubSubConnection); } catch (final RedisCommandTimeoutException e) { commandTimeoutMeter.mark(); + log.warn("Command timeout exception ({}-pubsub)", this.name, e); throw e; } })); 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 2b0825ac2..147a51ed4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java @@ -118,6 +118,7 @@ public class FaultTolerantRedisCluster { consumer.accept(connection); } catch (final RedisCommandTimeoutException e) { commandTimeoutMeter.mark(); + log.warn("Command timeout exception ({})", this.name, e); throw e; } })); @@ -139,6 +140,7 @@ public class FaultTolerantRedisCluster { return function.apply(connection); } catch (final RedisCommandTimeoutException e) { commandTimeoutMeter.mark(); + log.warn("Command timeout exception ({})", this.name, e); throw e; } }));