Merge pull request #2443 from rdunlop/prepare_for_sidekiq_7

update sidekiq to latest < 7
rdunlop · Sep 29, 2023 · b7a25d8 · b7a25d8
2 parents 23541f5 + 79a6a5f
commit b7a25d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -259,7 +259,7 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.2.2)
-    connection_pool (2.3.0)
+    connection_pool (2.4.1)
     consistency_fail (0.3.7)
     countries (3.1.0)
       i18n_data (~> 0.11.0)
@@ -607,8 +607,8 @@ GEM
     select2-rails (4.0.13)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
+    sidekiq (6.5.9)
+      connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
     simple_form (5.1.0)

diff --git a/config/application.rb b/config/application.rb
@@ -78,7 +78,7 @@ class Application < Rails::Application
     config.redis_host = ENV["REDIS_HOST"]
     config.redis_port = ENV["REDIS_PORT"]
     # db: 0 # if you have sidekiq for different rails-databases running against the same redis, increment this for each
-    config.redis_db = ENV["REDIS_DB"]
+    config.redis_db = ENV["REDIS_DB"].to_i
 
     # where to send users who want to do translations of the registration system
     config.translation_website_url = ENV["TRANSLATION_WEBSITE_URL"]

diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
@@ -12,8 +12,7 @@ def self.cache_configuration
 
   def self.sidekiq_configuration
     configuration do |config|
-      # Provided by redis-namespace gem
-      config[:namespace] = 'SIDEKIQ'
+      config[:db] += 1
     end
   end
 

diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
@@ -54,6 +54,7 @@
 
   # Enable delayed reporting (using Sidekiq)
   config.use_sidekiq
+  config.async_json_payload = true
   # You can supply custom Sidekiq options:
   config.use_sidekiq 'queue' => 'default'