switchman-inst-jobs 1.3.7 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bab0c63ffbb0a328830881dd3a7c4d87dcf4d257924540e3f817987cc0b02ca
-  data.tar.gz: 4efc1a1f73cd1c4e3343ebabb4aee21ce8b974b7191052616d6e1266e1547875
+  metadata.gz: e356c85ca33caeb996923b7f3e4c94da8b248926f87d5377ff045940a7095528
+  data.tar.gz: 2ea9d61311e2c647e312db5ac784057fe3daa2d7a5c18223e5566a6cab99feb9
 SHA512:
-  metadata.gz: 79109e3f82d473756cdb953c78b5e062c6f5bd4f262356c86c4502abe5aebff40a45679dea2ec530552d23b104fd70ab3f75f7686587d0da75c28ff97bc963fe
-  data.tar.gz: 39dda681ada80591021c3ca33df1061ae62307d94870fd6e4f5193cc361a4353a4b74f7ac86e0a4ab8bfd1fa4f4e800ac7556bbc6d4572b3ea314b5f4b551bf9
+  metadata.gz: 36533c7c02872720de54a09dd48e4e54aaa806600320699bccacd0fe67fac9c000020eddb5604b3ed371ad0d8565ec3afd9fad9273524ba3935cc0d7b8e14312
+  data.tar.gz: adbc33542dd9ea39d628370e8580dca9d957fe002da78e8b35746aaa871b74610c2bff6681d955afa5c756650fcfd0130416011264f3811e545b26b8e87e07a0

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

@@ -64,12 +64,14 @@ module SwitchmanInstJobs
 
         def deserialize(source)
           raise ShardNotFoundError, shard_id unless current_shard
+
           current_shard.activate { super }
         rescue ::Switchman::ConnectionError, PG::ConnectionBad, PG::UndefinedTable
           # likely a missing shard with a stale cache
           current_shard.send(:clear_cache)
           ::Switchman::Shard.clear_cache
           raise ShardNotFoundError, shard_id unless ::Switchman::Shard.where(id: shard_id).exists?
+
           raise
         end
       end

data/lib/switchman_inst_jobs/delayed/message_sending.rb

@@ -3,6 +3,7 @@ module SwitchmanInstJobs
     module MessageSending
       def send_later_enqueue_args(method, _enqueue_args = {}, *args)
         return send(method, *args) if ::Switchman::DatabaseServer.creating_new_shard
+
         super
       end
     end

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

@@ -20,15 +20,20 @@ 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
+            call_super = shards.first if shards.length == 1
+            unless call_super == false
+              call_super.activate(:delayed_jobs) do
+                return munge_service_name(call_super) { super() }
+              end
+            end
 
             ::Switchman::Shard.with_each_shard(shards, [:delayed_jobs], exception: :ignore) do
+              shard = ::Switchman::Shard.current(:delayed_jobs)
               singleton = <<~SINGLETON
-                periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{::Switchman::Shard.current(:delayed_jobs).id}
+                periodic: Delayed::Worker::HealthCheck.reschedule_abandoned_jobs:#{shard.id}
               SINGLETON
               send_later_enqueue_args(
-                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: true
+                :reschedule_abandoned_jobs, { singleton: singleton }, call_super: shard
               )
             end
           end

data/lib/switchman_inst_jobs/switchman/database_server.rb

@@ -3,6 +3,7 @@ module SwitchmanInstJobs
     module DatabaseServer
       def delayed_jobs_shard(shard = nil)
         return shard if config[:delayed_jobs_shard] == 'self'
+
         dj_shard =
           config[:delayed_jobs_shard] &&
           ::Switchman::Shard.lookup(config[:delayed_jobs_shard])

data/lib/switchman_inst_jobs/switchman/shard.rb

@@ -76,6 +76,7 @@ module SwitchmanInstJobs
 
               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
 

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '1.3.7'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/lib/switchman_inst_jobs/yaml_extensions.rb

@@ -5,7 +5,7 @@ module SwitchmanInstJobs
         if object.tag == '!ruby/ActiveRecord:Switchman::Shard'
           ::Switchman::Shard.lookup(object.value) ||
             raise(Delayed::Backend::RecordNotFound,
-              "Couldn't find Switchman::Shard with id #{object.value.inspect}")
+                  "Couldn't find Switchman::Shard with id #{object.value.inspect}")
         else
           super
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.1
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.16'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.15'
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.16'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.7
+        version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.15'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.7
+        version: '1.14'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.15'
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,42 +202,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.79.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
 description: 
 email:
 - bpetty@instructure.com
@@ -276,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="