govuk_sidekiq 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df36f07a855664bcd0022727e6b7e6d0b255df9e28d82e256d8542cc68a99ae
-  data.tar.gz: 61e191ea3d6f277a5bfc72d50c0e794d2bc58471e91b3af5bbf97d0586b5fd4b
+  metadata.gz: 360dbfaafbf182d077a3d010a9b8f7aef892873a74dba9d5360225873bb3dd9e
+  data.tar.gz: 57f5fdc1396bb897fb91497d49dfbe42e63e6d0ed4678484eff67ac9946160a8
 SHA512:
-  metadata.gz: 9dbf5756a97595d4ceaa3e02ce941d949f44f904ad43b5f0bd7e0a713a2cef45e4976c50ae13cafc2ae654a49d29c06955dd4ec0d05fc808e26c2621f9ad8263
-  data.tar.gz: 21ac94434996452d35bde7ffed3e1ca46ed64b5482573dc2a5ffb0d5b2cfc64d822f4f1a72b042a527b6d434b9a2448f58e52af963f80f54143f16b766e2bec6
+  metadata.gz: 592383166d00c61ac5691cc203545c95664bdbc16e5551db9a3df4ad549c197f22a1a49a59ee35a1839ed759ab4adcb2fb2f5bb0b6cd4d0ba4f42ac9b7530592
+  data.tar.gz: 1122c8ac78c73e2d881510d34156d1b2b718433d5e72a2402e870dce15ebc15513391aa2ab136764b9908d2b8ac7cf298e4b0aa55e37dec06f8a3bea04c2bbe8

data/README.md

@@ -50,10 +50,8 @@ worker: bundle exec sidekiq -C ./config/sidekiq.yml
 
 ### 4. Configure puppet
 
-- Set `REDIS_HOST` and `REDIS_PORT` variables. `GOVUK_APP_NAME` should also be
-set, but this is already done by the default `govuk::app::config`. If your Redis instance
-requires more advanced connection settings (eg username and password) you can instead
-set a `REDIS_URL` variable, this will take precidence over `REDIS_HOST` and `REDIS_PORT`.
+- Set a `REDIS_URL` environment variable. `GOVUK_APP_NAME` should also be
+set, but this is already done by the default `govuk::app::config`.
 
     Apply redis variables for your app in [the default config](https://github.com/alphagov/govuk-puppet/blob/master/hieradata/common.yaml). For example:
 

data/lib/govuk_sidekiq/railtie.rb

@@ -3,18 +3,9 @@ require "govuk_sidekiq/sidekiq_initializer"
 module GovukSidekiq
   class Railtie < Rails::Railtie
     initializer "govuk_sidekiq.initialize_sidekiq" do |app|
-      config = if ENV["REDIS_URL"]
-                 { url: ENV["REDIS_URL"] }
-               else
-                 {
-                   host: ENV.fetch("REDIS_HOST", "127.0.0.1"),
-                   port: ENV.fetch("REDIS_PORT", 6379),
-                 }
-               end
-
       SidekiqInitializer.setup_sidekiq(
         ENV["GOVUK_APP_NAME"] || app.root.basename.to_s,
-        config,
+        { url: ENV.fetch("REDIS_URL", "redis://127.0.0.1:6379") },
       )
     end
   end

data/lib/govuk_sidekiq/sidekiq_initializer.rb

@@ -6,7 +6,7 @@ require "govuk_app_config/govuk_statsd"
 
 module GovukSidekiq
   module SidekiqInitializer
-    def self.setup_sidekiq(govuk_app_name, redis_config)
+    def self.setup_sidekiq(govuk_app_name, redis_config = {})
       redis_config = redis_config.merge(
         namespace: govuk_app_name,
         reconnect_attempts: 1,

data/lib/govuk_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module GovukSidekiq
-  VERSION = "4.0.0".freeze
+  VERSION = "5.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Provides standard setup and behaviour for Sidekiq in GOV.UK applications.