Merge pull request #108 from alphagov/fix-reconnect-attempts

Fix `reconnect_attempts` not working with Redis 4.8
alphagov · Jun 11, 2024 · 3312287 · 3312287
2 parents c73ca2f + 32def77
commit 3312287
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+
+* Fix support for `reconnect_attempts` not working with Redis 4.8 (which is required due to the sidekiq version specified)
+
 # 8.0.0
 
 * BREAKING: Drop support for Ruby 3.0. The minimum required Ruby version is now 3.1.4.

diff --git a/govuk_sidekiq.gemspec b/govuk_sidekiq.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "gds-api-adapters", ">= 19.1.0"
   spec.add_dependency "govuk_app_config", ">= 1.1"
+  spec.add_dependency "redis", "< 5"
   spec.add_dependency "redis-namespace", "~> 1.6"
   spec.add_dependency "sidekiq", "~> 6.5", ">= 6.5.12"
 

diff --git a/lib/govuk_sidekiq/sidekiq_initializer.rb b/lib/govuk_sidekiq/sidekiq_initializer.rb
@@ -7,12 +7,9 @@ module SidekiqInitializer
     def self.setup_sidekiq(govuk_app_name, redis_config = {})
       redis_config = redis_config.merge(
         namespace: govuk_app_name,
-        reconnect_attempts: [
-          0,
-          15,
-          30,
-          60,
-        ],
+        reconnect_attempts: 4,
+        reconnect_delay: 15,
+        reconnect_delay_max: 60,
       )
 
       Sidekiq.configure_server do |config|