inst-jobs 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa0a9108f1f1440f7e5a1e85751f9b359c87a07c96ef915e957fd7273f03e70
-  data.tar.gz: '081a50c77e4cab9add18ab344778d9eed42ca67d9c20a8e8c2fff9a47c0984f9'
+  metadata.gz: 2bea5022e36cc4d9748d96fd7abadcdf15e86704c0b79551ccabf32d093ad4fa
+  data.tar.gz: 262023f6a3892f685b31a97437913689b4b6c2f6017600a05e325030a3f6c620
 SHA512:
-  metadata.gz: 82752f8b1dcade468721c7a5e22680d875a799476380b0351b8eda4346aa914032efbd89c401d99d2de23b84c09c559d3a825c44e682b83ec3c6f3ce658e7d6e
-  data.tar.gz: 5db1c149af1f02f111998096dfe6207f622aa13481b8b6c8170153968c2e90c1319783932ea8bea0e31feb8589589f4c15c0dafda3205bfec61e26cf16c5caa4
+  metadata.gz: d073c05f492b416d0fa0a3a16e9337635289afc53107239d1bbf1b41370f0baad837315f59f997be912db61f13fc1b320aefb8ec68c9ccafce8f3eeb2825d266
+  data.tar.gz: 7f2182ecdea50d3e547d2b4fa1d99a1bcaace68936ae49fd006c5d03f7b4e4e008bcd792c1b35b0157379182b24d1bac8cca34c5c2dc85637953212db140e33c

data/lib/delayed/backend/active_record.rb

@@ -28,7 +28,11 @@ module Delayed
         scope :next_in_strand_order, -> { order(:strand_order_override, :id) }
 
         def self.reconnect!
-          clear_all_connections!
+          if Rails.version < "6.1"
+            ActiveRecord::Base.connection_handler.clear_all_connections!
+          else
+            ActiveRecord::Base.connection_handler.clear_all_connections!(nil)
+          end
         end
 
         class << self

data/lib/delayed/backend/base.rb

@@ -312,7 +312,13 @@ module Delayed
             payload_object.perform
           ensure
             Delayed::Job.in_delayed_job = false
-            ::ActiveRecord::Base.clear_active_connections! unless Rails.env.test?
+            unless Rails.env.test?
+              if Rails.version < "6.1"
+                ::ActiveRecord::Base.clear_active_connections!
+              else
+                ::ActiveRecord::Base.clear_active_connections!(nil)
+              end
+            end
           end
         end
       end

data/lib/delayed/pool.rb

@@ -67,11 +67,21 @@ module Delayed
 
       unlocked_jobs = Delayed::Job.unlock_orphaned_jobs(pid)
       say "Unlocked #{unlocked_jobs} orphaned jobs" if unlocked_jobs.positive?
-      ActiveRecord::Base.connection_handler.clear_all_connections! unless Rails.env.test?
+      return if Rails.env.test?
+
+      if Rails.version < "6.1"
+        ActiveRecord::Base.connection_handler.clear_all_connections!
+      else
+        ActiveRecord::Base.connection_handler.clear_all_connections!(nil)
+      end
     end
 
     def spawn_all_workers
-      ActiveRecord::Base.connection_handler.clear_all_connections!
+      if Rails.version < "6.1"
+        ActiveRecord::Base.connection_handler.clear_all_connections!
+      else
+        ActiveRecord::Base.connection_handler.clear_all_connections!(nil)
+      end
 
       if @config[:work_queue] == "parent_process"
         @work_queue = WorkQueue::ParentProcess.new

data/lib/delayed/server.rb

@@ -37,7 +37,13 @@ module Delayed
 
     # Release any used connections back to the pool
     after do
-      ActiveRecord::Base.clear_active_connections! if using_active_record?
+      if using_active_record?
+        if Rails.version < "6.1"
+          ::ActiveRecord::Base.clear_active_connections!
+        else
+          ::ActiveRecord::Base.clear_active_connections!(nil)
+        end
+      end
     end
 
     configure :development do

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

data/lib/delayed/work_queue/parent_process/server.rb

@@ -226,7 +226,11 @@ module Delayed
 
             # otherwise just reconnect and let it retry
             logger.warn("failed to unlock prefetched jobs - connection terminated; skipping for now")
-            Delayed::Job.clear_all_connections!
+            if Rails.version < "6.1"
+              Delayed::Job.clear_all_connections!
+            else
+              Delayed::Job.clear_all_connections!(nil)
+            end
           end
         end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Cody Cutrer
 - Ethan Vizitei
 - Jacob Burroughs
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -410,7 +410,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - cody@instructure.com
 - evizitei@instructure.com
@@ -504,7 +504,7 @@ homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -520,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files: []