switchman-inst-jobs 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6175dabd6f8d0d343728a55d9cee438df89cdef4f3f71a17c9aeddd9e4f8cf54
-  data.tar.gz: 71281b6a418355f247d8bc9840be991eaff15939b4b48eb5766fe485dcb58d08
+  metadata.gz: e39492734082a2e3a5f6a7056fcf6bef4ebda5952cbd9188de8fc8ae0e938630
+  data.tar.gz: f6dfdaf0c045612ac8af1cba019e01b9cd9a5ad75164f8dacd03fd030d0884a3
 SHA512:
-  metadata.gz: dd79f316dd7b2dc21e754f8c7b2a42e01bfad995146ed32d28b23883d8e56aff32428046a9715970ca349357bacf6db5dfb9f250161c595d69c17405fbefd94f
-  data.tar.gz: f42b6c28e9956c4301e92d016d65fd69dfe1dc686d1754a4e1d94575987fd38024f35418f34a69029b539bfdc9ebce241c0fc84c88ff9739bb4649baecafde3c
+  metadata.gz: 852061f2038fc91038289fe3fa2ce9a9b69cdc54e6aaa0aba403fed22ba1d9bd9b62da1215805bb6b598a3d5f9fa43b48748dde828c6ce60c62587952fb7d024
+  data.tar.gz: 40d8fa1ff7e15c54e4ad5c3ce967759d707c7eb8be9da70894768ae3d46aa93d4133003bdf95aa563c1a6baf9dfdf46ccdf8e642c9b6f7592ec5058775c5e87d

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

@@ -21,9 +21,7 @@ module SwitchmanInstJobs
           def reschedule_abandoned_jobs(call_super: false)
             shards = ::Switchman::Shard.delayed_jobs_shards
             call_super = true if shards.length == 1
-            if call_super
-              return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() }
-            end
+            return munge_service_name(::Switchman::Shard.current(:delayed_jobs)) { super() } if call_super
 
             ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs], exception: :ignore) do
               singleton = <<~SINGLETON

data/lib/switchman_inst_jobs/new_relic.rb

@@ -2,9 +2,7 @@ module SwitchmanInstJobs
   module NewRelic
     module FixNewRelicDelayedJobs
       module NewRelicJobInvoker
-        if defined?(::NewRelic)
-          include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-        end
+        include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation if defined?(::NewRelic)
 
         def invoke_job(*args, &block)
           options = {

data/lib/switchman_inst_jobs/switchman/database_server.rb

@@ -8,7 +8,12 @@ module SwitchmanInstJobs
           ::Switchman::Shard.lookup(config[:delayed_jobs_shard])
         # have to avoid recursion for the default shard asking for the default
         # shard's delayed_jobs_shard
-        dj_shard ||= shard if shard&.default?
+        if shard&.default?
+          # first look for any shard that behaves like a jobs shard
+          dj_shard ||= ::Switchman::Shard.delayed_jobs_shards.first
+          # we're really truly out of options, use the default shard itself
+          dj_shard ||= shard
+        end
         dj_shard ||= SwitchmanInstJobs.delayed_jobs_shard_fallback&.call(self, shard)
         dj_shard || ::Switchman::Shard.default.delayed_jobs_shard
       end

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -18,6 +18,11 @@ module SwitchmanInstJobs
       end
 
       module ClassMethods
+        def clear_cache
+          super
+          remove_instance_variable(:@delayed_jobs_shards) if instance_variable_defined?(:@delayed_jobs_shards)
+        end
+
         def current(category = :primary)
           if category == :delayed_jobs
             active_shards[category] || super(:primary).delayed_jobs_shard
@@ -53,19 +58,27 @@ module SwitchmanInstJobs
         end
 
         def delayed_jobs_shards
-          @delayed_jobs_shards ||= begin
-            db_dj_shards = ::Switchman::DatabaseServer.all.map do |db|
-              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
-            (db_dj_shards + shard_dj_shards).uniq.sort
+          unless instance_variable_defined?(:@delayed_jobs_shards)
+            # re-entrancy protection
+            @delayed_jobs_shards = []
+            @delayed_jobs_shards = begin
+              db_dj_shards = ::Switchman::DatabaseServer.all.map do |db|
+                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 = [] unless ::Switchman::Shard.columns_hash.key?('delayed_jobs_shard_id')
+              shard_dj_shards ||= begin
+                ::Switchman::Shard
+                  .where.not(delayed_jobs_shard_id: nil)
+                  .distinct
+                  .pluck(:delayed_jobs_shard_id)
+                  .map { |id| ::Switchman::Shard.lookup(id) }
+                  .compact
+              end
+              (db_dj_shards + shard_dj_shards).uniq.sort
+            end
           end
+          @delayed_jobs_shards
         end
       end
     end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs