switchman-inst-jobs 4.0.6 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fb55d3fff48ff95a3fae70acc49935250642ac4b2b24d3ece10e9d5624e1dd
-  data.tar.gz: 8544c358faaa63992a5db35db5d1d2a7317048349d91857d9b0241b02ec30b13
+  metadata.gz: c6453b4fb5882411028c48e458ec49ee8dd14686b6baa889053bdc44c0f43ecc
+  data.tar.gz: b5883129b65be01ce10acdb373bdd8bcc95c76e8a18eb4326cb2590b71ead518
 SHA512:
-  metadata.gz: f4601a44b1c795edb3302f5b9174292ff7724315cdb321a0fd9213f44eb72e3ffb0d48195f03426c7701eb32232b550f8bff325ea48f2f89133c7ba2e8039653
-  data.tar.gz: 8651595cec7bf1f67544e33fe806f1f082fe26809fdadacb7ad86ebfb885436db5c9333e09a1d4c320fc52dee7b1b942fe646524e1ee45d8db62b88b3f116397
+  metadata.gz: adc1ed9eb64a227ecbe46f98f92e6b357c595249ad681a4dd3b649fade15b5848ebb4cf15feca35b49ca2c312abe31ef3357941f666be11ad554a1f5cc37892c
+  data.tar.gz: f0d8cd82e01d15b698f57417f2b2d88cb0263bbd47cfba167a812158f89a5110e653590b3e125f65c5555e3f580f346bbf5f1de9b0a58cc8f951bd326d348e9e

data/db/migrate/20220328152900_add_failed_jobs_indicies.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddFailedJobsIndicies < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :failed_jobs, :failed_at, algorithm: :concurrently
+    add_index :failed_jobs, :strand, where: 'strand IS NOT NULL', algorithm: :concurrently
+    add_index :failed_jobs, :singleton, where: 'singleton IS NOT NULL', algorithm: :concurrently
+    add_index :failed_jobs, :tag, algorithm: :concurrently
+  end
+end

data/db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRequeuedJobIdToFailedJobs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :failed_jobs, :requeued_job_id, :integer, limit: 8
+  end
+end

data/lib/switchman_inst_jobs/delayed/backend/active_record/abstract_job.rb

@@ -6,7 +6,9 @@ module SwitchmanInstJobs
           module ClassMethods
             def current_switchman_shard
               connected_to_stack.reverse_each do |hash|
-                return hash[:switchman_shard] if hash[:switchman_shard] && hash[:klasses].include?(connection_classes)
+                if hash[:switchman_shard] && hash[:klasses].include?(connection_class_for_self)
+                  return hash[:switchman_shard]
+                end
               end
 
               ::ActiveRecord::Base.current_switchman_shard.delayed_jobs_shard

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

@@ -14,7 +14,7 @@ module SwitchmanInstJobs
         module ClassMethods
           def enqueue(object, **options)
             ::Switchman::Shard.periodic_clear_shard_cache
-            current_shard = ::Switchman::Shard.current
+            current_shard = options[:current_shard] || ::Switchman::Shard.current
             enqueue_options = options.merge(
               current_shard: current_shard
             )
@@ -35,8 +35,10 @@ module SwitchmanInstJobs
                 enqueue_options[:next_in_strand] = false
               end
 
-              current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
-                enqueue_job.call
+              current_shard.activate do
+                current_job_shard.activate(::Delayed::Backend::ActiveRecord::AbstractJob) do
+                  enqueue_job.call
+                end
               end
             end
           end

data/lib/switchman_inst_jobs/delayed/message_sending.rb

@@ -4,6 +4,7 @@ module SwitchmanInstJobs
       def delay(sender: nil, synchronous: false, **enqueue_args)
         sender ||= __calculate_sender_for_delay
         synchronous ||= ::Switchman::DatabaseServer.creating_new_shard
+        enqueue_args[:current_shard] = ::Switchman::Shard.current
 
         super
       end

data/lib/switchman_inst_jobs/version.rb

@@ -1,3 +1,3 @@
 module SwitchmanInstJobs
-  VERSION = '4.0.6'.freeze
+  VERSION = '4.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchman-inst-jobs
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.9
 platform: ruby
 authors:
 - Bryan Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inst-jobs
@@ -53,7 +53,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,27 +63,35 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: switchman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -280,20 +288,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 description: 
 email:
 - bpetty@instructure.com
@@ -344,6 +338,8 @@ files:
 - db/migrate/20220128084800_update_insert_trigger_for_singleton_unique_constraint_change.rb
 - db/migrate/20220128084900_update_delete_trigger_for_singleton_unique_constraint_change.rb
 - db/migrate/20220203063200_remove_old_singleton_index.rb
+- db/migrate/20220328152900_add_failed_jobs_indicies.rb
+- db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb
 - lib/switchman-inst-jobs.rb
 - lib/switchman_inst_jobs.rb
 - lib/switchman_inst_jobs/active_record/connection_adapters/postgresql_adapter.rb
@@ -379,14 +375,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Switchman and Instructure Jobs compatibility gem.