switchman-inst-jobs 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1312fe2082207ca69ad3531914f02cfeb8e6083
-  data.tar.gz: 35c77ccc1aae09543d79a5d8a214ff9fcfeeed2e
+  metadata.gz: 5f3a0d265455c2a917a95287a0f7c768b0813d1a
+  data.tar.gz: 9a3bb7dc110aad2a9641d6c117f2a3fcbd1428e0
 SHA512:
-  metadata.gz: e8b86328c038c6ce55feaf429934c647144b01881ca2604aa6b411c7aaf04b04c1770ee8b534b53f4cbb97c6e7d7181b9773808a956d579ee1db5a6977c65530
-  data.tar.gz: 7a4ccd1df0fc37a7bbc48196fa4d5c7f0886eab3d9b4643175456e212d36c409bc35c2dc174cb31e29390adf62417a78115abc8a833d435e10cda698a3270501
+  metadata.gz: de054363463c33fecec8950c1ac38357650217665cbddaa45e9c54df6baa3dfe7bd4065f304a4a518ebbc59e96bf739afcceb2c5072795d57ce258fc6d667450
+  data.tar.gz: 3547050ecabf7d90c5fff12ca6e2307959edbcedc63b7729ccf6e84cc4745eae99e4edf9b572c590f93adf5b8c619a6116f3671126c9034a6280be9c641dadd2

data/lib/switchman_inst_jobs/delayed/backend/base.rb

@@ -27,7 +27,8 @@ module SwitchmanInstJobs
           end
 
           def configured_shard_ids
-            (::Delayed::Settings.worker_config.try(:[], "workers") || []).map{|w| w["shard"]}.compact.uniq
+            (::Delayed::Settings.worker_config.try(:[], 'workers') || [])
+              .map { |w| w['shard'] }.compact.uniq
           end
 
           def processes_locked_locally
@@ -68,9 +69,7 @@ module SwitchmanInstJobs
           # likely a missing shard with a stale cache
           current_shard.send(:clear_cache)
           ::Switchman::Shard.clear_cache
-          unless ::Switchman::Shard.where(id: shard_id).exists?
-            raise ShardNotFoundError, shard_id
-          end
+          raise ShardNotFoundError, shard_id unless ::Switchman::Shard.where(id: shard_id).exists?
           raise
         end
       end

data/lib/switchman_inst_jobs/delayed/worker/health_check.rb

@@ -10,7 +10,9 @@ module SwitchmanInstJobs
           def munge_service_name(shard)
             # munge the name to add the current shard
             original_service_name = ::Delayed::Settings.worker_health_check_config['service_name']
-            ::Delayed::Settings.worker_health_check_config['service_name'] = "#{original_service_name || ::Delayed::Worker::ConsulHealthCheck::DEFAULT_SERVICE_NAME}/#{shard.id}"
+            consul_service_name = ::Delayed::Worker::ConsulHealthCheck::DEFAULT_SERVICE_NAME
+            ::Delayed::Settings.worker_health_check_config['service_name'] =
+              "#{original_service_name || consul_service_name}/#{shard.id}"
             yield
           ensure
             ::Delayed::Settings.worker_health_check_config['service_name'] = original_service_name
@@ -19,12 +21,17 @@ module SwitchmanInstJobs
           def reschedule_abandoned_jobs(call_super: false)
             shards = ::Switchman::Shard.delayed_jobs_shards
             call_super = true if shards.length == 1
-            return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() } if call_super
+            if call_super
+              return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() }
+            end
 
             ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs]) do
-              self.send_later_enqueue_args(:reschedule_abandoned_jobs,
-                                           { singleton: "periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{::Switchman::Shard.current(:delayed_jobs).id}" },
-                                           call_super: true)
+              singleton = <<~SINGLETON
+                periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{::Switchman::Shard.current(:delayed_jobs).id}
+              SINGLETON
+              send_later_enqueue_args(
+                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: true
+              )
             end
           end
         end

data/lib/switchman_inst_jobs/engine.rb

@@ -2,8 +2,7 @@ module SwitchmanInstJobs
   class Engine < ::Rails::Engine
     isolate_namespace SwitchmanInstJobs
 
-    initializer 'sharding.active_record',
-                after: 'switchman.extend_connection_adapters' do
+    initializer 'sharding.active_record', after: 'switchman.extend_connection_adapters' do
       SwitchmanInstJobs.initialize_active_record
     end
 
@@ -11,8 +10,7 @@ module SwitchmanInstJobs
       SwitchmanInstJobs.initialize_inst_jobs
     end
 
-    initializer 'sharding.shackles',
-                after: 'switchman.extend_shackles' do
+    initializer 'sharding.shackles', after: 'switchman.extend_shackles' do
       SwitchmanInstJobs.initialize_shackles
     end
 

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -58,12 +58,12 @@ module SwitchmanInstJobs
               next db.shards.to_a if db.config[:delayed_jobs_shard] == 'self'
               db.delayed_jobs_shard
             end.compact.flatten.uniq # yes, all three
-            shard_dj_shards = ::Switchman::Shard.
-                where.not(delayed_jobs_shard_id: nil).
-                distinct.
-                pluck(:delayed_jobs_shard_id).
-                map { |id| ::Switchman::Shard.lookup(id) }.
-                compact
+            shard_dj_shards = ::Switchman::Shard
+              .where.not(delayed_jobs_shard_id: nil)
+              .distinct
+              .pluck(:delayed_jobs_shard_id)
+              .map { |id| ::Switchman::Shard.lookup(id) }
+              .compact
             (db_dj_shards + shard_dj_shards).uniq.sort
           end
         end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -19,7 +19,7 @@ dependencies:
         version: 0.12.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.12.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.57.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement