From b8c352bb5d2ae547f9ba3826db6ab60e7e6d0fb3 Mon Sep 17 00:00:00 2001
From: Christian Bruckmayer <christian.bruckmayer@shopify.com>
Date: Wed, 14 May 2025 18:56:19 +0100
Subject: [PATCH] Bump Redis timeout

---
 ruby/lib/ci/queue/redis/base.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruby/lib/ci/queue/redis/base.rb b/ruby/lib/ci/queue/redis/base.rb
index 5f9be7b7..9f42c919 100644
--- a/ruby/lib/ci/queue/redis/base.rb
+++ b/ruby/lib/ci/queue/redis/base.rb
@@ -11,6 +11,8 @@ class Base
           ::SocketError, # https://github.com/redis/redis-rb/pull/631
         ].freeze
 
+        DEFAULT_TIMEOUT = 2
+
         module RedisInstrumentation
           def call(command, redis_config)
             logger = redis_config.custom[:debug_log]
@@ -45,9 +47,10 @@ def initialize(redis_url, config)
               # ci-queue should not contain any sensitive data, so we can just disable the verification.
               ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE },
               custom: custom_config,
+              timeout: DEFAULT_TIMEOUT,
             )
           else
-            @redis = ::Redis.new(url: redis_url)
+            @redis = ::Redis.new(url: redis_url, timeout: DEFAULT_TIMEOUT)
           end
         end