govuk_sidekiq 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e136c2c5bc0a583e4f7753107027f9109c31db
-  data.tar.gz: cb216e639c4c4a9ad2ea4947a25ab2a115329702
+  metadata.gz: 3aee561f69e1eedfe1142713f3477597dc773427
+  data.tar.gz: b90f651358f70dfdcd0f66d2490ee47d6ceed252
 SHA512:
-  metadata.gz: 3d8437aadb751c4238d8a76c73e1af1c70c9230d532c83ca092296aee9b277aa1f573c32861f78bbcf8722a03434094b1b8c95eed18bc6f207bbdb975db3d442
-  data.tar.gz: 8a9b822af41ac13cd381b0c07d6425208ab40a9ae1fe864206bcefa94643a060306a0e2a2a3bef658790ed8567e42e7f3ed603719711cdb0fa268bbf42b34132
+  metadata.gz: e2dd6b60266dfc6d8db43268e669b29300a48ee5c95290f2468bc87899f4dfec2fd33ad466fe72d27716a9e0123c18526c869a387871baf842014469c810b739
+  data.tar.gz: 5c2ff2c94185cc3328f33702b288a6ee805af767f265ef252dea19833dc6a9c22df2f36323c84f75768014c6677d90d0ef15a45ebd0d996f086be3c7d02d08b0

data/README.md

@@ -50,7 +50,16 @@ 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`.
+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`.
+
+    Apply redis variables for your app in [the default config](https://github.com/alphagov/govuk-puppet/blob/master/hieradata/common.yaml). For example:
+    
+    ```
+    govuk::apps::your_app::redis_host: "%{hiera('sidekiq_host')}"
+    govuk::apps::your_app::redis_port: "%{hiera('sidekiq_port')}"
+    ```
 - Make sure puppet creates and starts the Procfile worker.
 
 There's no step-by-step guide for this, but [you can copy the config from collections-publisher](https://github.com/alphagov/govuk-puppet/blob/master/modules/govuk/manifests/apps/collections_publisher.pp).
@@ -73,7 +82,7 @@ See the [Pinfile](https://github.gds/gds/development/blob/master/Pinfile) and
 
 ### 7. Add app to sidekiq-monitoring
 
-See the opsmanual for a step-by-step guide: [HOWTO: Add sidekiq-monitoring to your application](https://github.gds/pages/gds/opsmanual/infrastructure/howto/setting-up-new-sidekiq-monitoring-app.html)
+See the opsmanual for a step-by-step guide: [HOWTO: Add sidekiq-monitoring to your application](https://docs.publishing.service.gov.uk/manual/setting-up-new-sidekiq-monitoring-app.html)
 
 ### 8. Create some jobs
 

data/lib/govuk_sidekiq/railtie.rb

@@ -3,10 +3,18 @@ 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,
-        ENV["REDIS_HOST"] || "127.0.0.1",
-        ENV["REDIS_PORT"] || 6379
+        config
       )
     end
   end

data/lib/govuk_sidekiq/sidekiq_initializer.rb

@@ -1,22 +1,18 @@
 require "sidekiq"
 require "sidekiq/logging/json"
 require "sidekiq-statsd"
-require "airbrake"
 require "govuk_sidekiq/api_headers"
 
 module GovukSidekiq
   module SidekiqInitializer
-    def self.setup_sidekiq(govuk_app_name, redis_host, redis_port)
-      redis_config = {
-        host: redis_host,
-        port: redis_port,
+    def self.setup_sidekiq(govuk_app_name, redis_config)
+      redis_config = redis_config.merge(
         namespace: govuk_app_name,
         reconnect_attempts: 1,
-      }
+      )
 
       Sidekiq.configure_server do |config|
         config.redis = redis_config
-        config.error_handlers << Proc.new { |ex, context_hash| Airbrake.notify(ex, context_hash) }
 
         config.server_middleware do |chain|
           chain.add Sidekiq::Statsd::ServerMiddleware, env: "govuk.app.#{govuk_app_name}", prefix: "workers"

data/lib/govuk_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module GovukSidekiq
-  VERSION = "1.0.3"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Elliot Crosby-McCullough
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 19.1.0
-- !ruby/object:Gem::Dependency
-  name: airbrake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -123,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
-  name: gem_publisher
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.10'
 description: 
 email:
 - elliot.cm@gmail.com
@@ -185,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Provides standard setup and behaviour for Sidekiq in GOV.UK applications.