From fb9aa672c9e97e7af23874bed2a18c96216b2bd1 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 11 Nov 2020 12:38:17 -0500
Subject: [PATCH] Include the name of the calling thread when a command times
 out.

---
 .../textsecuregcm/redis/FaultTolerantPubSubConnection.java      | 2 +-
 .../textsecuregcm/redis/FaultTolerantRedisCluster.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 984938295..093c2510d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantPubSubConnection.java
@@ -97,7 +97,7 @@ public class FaultTolerantPubSubConnection<K, V> {
 
     private void recordCommandTimeout(final RedisCommandTimeoutException e) {
         commandTimeoutMeter.mark();
-        log.warn("Command timeout exception ({}-pubsub)", this.name, e);
+        log.warn("[{}] Command timeout exception ({}-pubsub)", Thread.currentThread().getName(), this.name, e);
 
         if (wroteThreadDump.compareAndSet(false, true)) {
             ThreadDumpUtil.writeThreadDump();
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 7e872acaa..c613deaa8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
@@ -163,7 +163,7 @@ public class FaultTolerantRedisCluster {
 
     private void recordCommandTimeout(final RedisCommandTimeoutException e) {
         commandTimeoutMeter.mark();
-        log.warn("Command timeout exception ({})", this.name, e);
+        log.warn("[{}] Command timeout exception ({})", Thread.currentThread().getName(), this.name, e);
 
         if (wroteThreadDump.compareAndSet(false, true)) {
             ThreadDumpUtil.writeThreadDump();