govuk_sidekiq 8.0.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b4ab2c71b0c6f3a467cfe76ec1e7308326d944c6567ecfbeecc7b602e42b65
-  data.tar.gz: 212e668881f3a9c0f312e6b12ae5fd635cfd6a9e25e2d0f64a974ca99e06b5a3
+  metadata.gz: b170a15b6b0a3a7f44bebbc052720d696908ae99f9e535d633efb9ad9dd7c54f
+  data.tar.gz: 0bb96f89538aa771b546e05b64a15293e12bcf21e191dfc2ea029d78de36b442
 SHA512:
-  metadata.gz: 2e9f0e736b6e4ec68943af328749c6db2c105a25d1cdc64b0c1282ecdbbd3813f91b5fe8ee685a568aa32cf9364c674a56b480c0c815f5d678f62207682290df
-  data.tar.gz: ee5fa55517ffe8d6f9059479878dcfab062a819f12023c4f495d630966abbc36b2358cf03140973924ed163c43be4830c5395e9f925b98a1230a7fd135033af5
+  metadata.gz: bc859c90d6cd45da1111177dfd7eb6ad4bec5a03f9f3f148567d71e24721f7ce9c5c98f8ab2f327e7ac76fb0986d4eb14f02669a4fed6d524e1344d39c56c6e8
+  data.tar.gz: b5e06dffc8cc92fde8a4a286f9caf1db2d770973e3755160d057862f1b5046167a7f6ca6492fbe436ab8de041004e588d603e993ca064ee338db7ff2c648d1ed

data/lib/govuk_sidekiq/railtie.rb

@@ -2,11 +2,15 @@ require "govuk_sidekiq/sidekiq_initializer"
 
 module GovukSidekiq
   class Railtie < Rails::Railtie
-    initializer "govuk_sidekiq.initialize_sidekiq" do |app|
+    initializer "govuk_sidekiq.initialize_sidekiq" do
       SidekiqInitializer.setup_sidekiq(
-        ENV.fetch("GOVUK_APP_NAME", app.root.basename.to_s),
         { url: ENV.fetch("REDIS_URL", "redis://127.0.0.1:6379") },
       )
     end
+
+    rake_tasks do
+      path = File.expand_path(__dir__)
+      Dir.glob("#{path}/tasks/**/*.rake").each { |f| load f }
+    end
   end
 end

data/lib/govuk_sidekiq/sidekiq_initializer.rb

@@ -4,13 +4,8 @@ require "govuk_sidekiq/govuk_json_formatter"
 
 module GovukSidekiq
   module SidekiqInitializer
-    def self.setup_sidekiq(govuk_app_name, redis_config = {})
-      redis_config = redis_config.merge(
-        namespace: govuk_app_name,
-        reconnect_attempts: 4,
-        reconnect_delay: 15,
-        reconnect_delay_max: 60,
-      )
+    def self.setup_sidekiq(redis_config = {})
+      redis_config = redis_config.merge(reconnect_attempts: [15, 30, 45, 60])
 
       Sidekiq.configure_server do |config|
         # $real_stdout is defined by govuk_app_config and is used to point to
@@ -21,7 +16,7 @@ module GovukSidekiq
         # rubocop:disable Style/GlobalVars
         config.logger = Sidekiq::Logger.new($real_stdout) if defined?($real_stdout)
         # rubocop:enable Style/GlobalVars
-        config.log_formatter = GovukSidekiq::GovukJsonFormatter.new if ENV["GOVUK_SIDEKIQ_JSON_LOGGING"]
+        config.logger.formatter = GovukSidekiq::GovukJsonFormatter.new if ENV["GOVUK_SIDEKIQ_JSON_LOGGING"]
 
         config.redis = redis_config
 

data/lib/govuk_sidekiq/tasks/redis_namespace.rake

@@ -0,0 +1,15 @@
+namespace :redis_namespace do
+  desc "Remove application specific namespacing for all Redis keys"
+  task :remove_namespace, :environment do
+    namespace = ENV["GOVUK_APP_NAME"]
+
+    redis = RedisClient.new(url: ENV["REDIS_URL"])
+
+    namespaced_keys = redis.call("KEYS", "#{namespace}:*")
+
+    namespaced_keys.each do |key|
+      new_key = key.gsub(/^#{namespace}:/, "")
+      redis.call("RENAME", key, new_key)
+    end
+  end
+end

data/lib/govuk_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module GovukSidekiq
-  VERSION = "8.0.1".freeze
+  VERSION = "9.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 9.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -39,53 +39,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: redis-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
-    - - ">="
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.5.12
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
-    - - ">="
+        version: '7.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.5.12
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +134,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 5.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 5.0.2
 description: 
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -170,6 +156,7 @@ files:
 - lib/govuk_sidekiq/govuk_json_formatter.rb
 - lib/govuk_sidekiq/railtie.rb
 - lib/govuk_sidekiq/sidekiq_initializer.rb
+- lib/govuk_sidekiq/tasks/redis_namespace.rake
 - lib/govuk_sidekiq/testing.rb
 - lib/govuk_sidekiq/version.rb
 homepage: http://github.com/alphagov/govuk_sidekiq
@@ -191,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.19
 signing_key: 
 specification_version: 4
 summary: Provides standard setup and behaviour for Sidekiq in GOV.UK applications.