switchman-inst-jobs 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39492734082a2e3a5f6a7056fcf6bef4ebda5952cbd9188de8fc8ae0e938630
-  data.tar.gz: f6dfdaf0c045612ac8af1cba019e01b9cd9a5ad75164f8dacd03fd030d0884a3
+  metadata.gz: 2bab0c63ffbb0a328830881dd3a7c4d87dcf4d257924540e3f817987cc0b02ca
+  data.tar.gz: 4efc1a1f73cd1c4e3343ebabb4aee21ce8b974b7191052616d6e1266e1547875
 SHA512:
-  metadata.gz: 852061f2038fc91038289fe3fa2ce9a9b69cdc54e6aaa0aba403fed22ba1d9bd9b62da1215805bb6b598a3d5f9fa43b48748dde828c6ce60c62587952fb7d024
-  data.tar.gz: 40d8fa1ff7e15c54e4ad5c3ce967759d707c7eb8be9da70894768ae3d46aa93d4133003bdf95aa563c1a6baf9dfdf46ccdf8e642c9b6f7592ec5058775c5e87d
+  metadata.gz: 79109e3f82d473756cdb953c78b5e062c6f5bd4f262356c86c4502abe5aebff40a45679dea2ec530552d23b104fd70ab3f75f7686587d0da75c28ff97bc963fe
+  data.tar.gz: 39dda681ada80591021c3ca33df1061ae62307d94870fd6e4f5193cc361a4353a4b74f7ac86e0a4ab8bfd1fa4f4e800ac7556bbc6d4572b3ea314b5f4b551bf9

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -60,12 +60,7 @@ module SwitchmanInstJobs
         def delayed_jobs_shards
           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
@@ -75,6 +70,15 @@ module SwitchmanInstJobs
                   .map { |id| ::Switchman::Shard.lookup(id) }
                   .compact
               end
+              # set it temporarily, to avoid the default shard falling back to itself
+              # if other shards are usable
+              @delayed_jobs_shards = shard_dj_shards.uniq.sort
+
+              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
+
               (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.3.6'.freeze
+  VERSION = '1.3.7'.freeze
 end

metadata

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