From bb9605d7c3805d45b3fc218c0849ca29786cc600 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 30 Jun 2023 17:54:32 -0500
Subject: [PATCH] Use RedisClient#setDefaultTimeout for a non-clustered client

---
 .../whispersystems/textsecuregcm/push/ProvisioningManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/ProvisioningManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/ProvisioningManager.java
index c3cad2427..5fe177aaa 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/ProvisioningManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/ProvisioningManager.java
@@ -19,12 +19,12 @@ import io.lettuce.core.pubsub.RedisPubSubAdapter;
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import io.lettuce.core.resource.ClientResources;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tags;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
-import io.micrometer.core.instrument.Tags;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
@@ -71,6 +71,7 @@ public class ProvisioningManager extends RedisPubSubAdapter<byte[], byte[]> impl
       final CircuitBreakerConfiguration circuitBreakerConfiguration) {
 
     this.redisClient = redisClient;
+    this.redisClient.setDefaultTimeout(timeout);
 
     this.subscriptionConnection = redisClient.connectPubSub(new ByteArrayCodec());
     this.publicationConnection = redisClient.connect(new ByteArrayCodec());