resque-durable 4.1.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6257d429be895292fae5ae5671c60007004e73eb6aa7f613a6d2b4e9c72383fc
-  data.tar.gz: baeeae3c5132d0603855ff487154e43cb139818d9c1d60e4193a8f9f70dd0a33
+  metadata.gz: 3b31b7b0781f9cb6c1656223ea92e19a91c8adf0b44e00b43ec25d5232b1bfe1
+  data.tar.gz: ac4249059fc80d52b0cc0b52e70dac2d02e02d4caebe2751ccc392023bfb2cb1
 SHA512:
-  metadata.gz: 5619f9f0ae64d8d54f25d833007c6b759308f4583de9b9aea322c28bd892fdc66f6ab8d3dff525d4073c2407e29a2bc60cb0e305c33b7fdd055064e430a25054
-  data.tar.gz: 7bad321f2c25e99b1bb0b95297afa541fca42823402d104a6c2dd23d9e2b2d1f19ff2d052a6f6b88c960cc76bb887db17709762e3cdaaa16140b254f490496a8
+  metadata.gz: f538d30e05c5c5e9046147a563a0aa4979d7db02f1de863056648b598c5c2bb0803ed2077b39561bf503272a1c4c5904095e4446510b0824e2dad56298d90e46
+  data.tar.gz: 6142d38af805e1f6983f37d690d64332e1c7f84730ee13ae633869feeeb278233fc24aac008f87e1f843e82043925c11bec8dc7c192a27cb3f717906f5bea320

data/lib/resque/durable/background_heartbeat.rb

@@ -37,7 +37,7 @@ module Resque
         @queue_audit.logger.error("Exception in BackgroundHeartbeat thread: #{e.class.name}: #{e.message}")
         self.class.exit_now!
       ensure
-        ActiveRecord::Base.clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!
       end
 
       def start!

data/lib/resque/durable/{queue_audit.rb → queue_audit_methods.rb}

@@ -3,36 +3,42 @@ require 'active_support/core_ext'
 
 module Resque
   module Durable
-    class QueueAudit < ActiveRecord::Base
+    module QueueAuditMethods
+      extend ActiveSupport::Concern
+
       JobCollision = Class.new(StandardError)
 
-      self.table_name = :durable_queue_audits
-      # id
-      # enqueued_id
-      # queue_name
-      # payload
-      # enqueue_count
-      # enqueued_at
-      # completed_at
-      # timeout_at
-      # updated_at
-      # created_at
-      DEFAULT_DURATION = 10.minutes
+      included do
+        self.table_name = :durable_queue_audits
+        # id
+        # enqueued_id
+        # queue_name
+        # payload
+        # enqueue_count
+        # enqueued_at
+        # completed_at
+        # timeout_at
+        # updated_at
+        # created_at
 
-      validates_inclusion_of :duration, :in => 1.minute.to_i..3.hours.to_i
+        validates_inclusion_of :duration, :in => 1.minute.to_i..3.hours.to_i
 
-      scope :older_than, ->(date) { where('created_at < ?', date).limit(10000) }
+        scope :older_than, ->(date) { where('created_at < ?', date).limit(10000) }
 
-      scope :failed, -> {
-        where(completed_at: nil)
-          .where('timeout_at < ?', Time.now.utc)
-          .order('timeout_at asc')
-          .limit(500)
-      }
+        scope :failed, -> {
+          where(completed_at: nil)
+            .where('timeout_at < ?', Time.now.utc)
+            .order('timeout_at asc')
+            .limit(500)
+        }
 
-      scope :complete, -> { where('completed_at is not null') }
+        scope :complete, -> { where('completed_at is not null') }
+      end
 
-      module Recovery
+      class_methods do
+        def initialize_by_klass_and_args(job_klass, args)
+          new(:job_klass => job_klass, :payload => args, :enqueued_id => GUID.generate)
+        end
 
         def recover
           failed.each do |audit|
@@ -48,12 +54,6 @@ module Resque
         def cleanup(date)
           older_than(date).delete_all
         end
-
-      end
-      extend Recovery
-
-      def self.initialize_by_klass_and_args(job_klass, args)
-        new(:job_klass => job_klass, :payload => args, :enqueued_id => GUID.generate)
       end
 
       def job_klass

data/lib/resque/durable/version.rb

@@ -0,0 +1,5 @@
+module Resque
+  module Durable
+    VERSION = "4.3.0"
+  end
+end

data/lib/resque/durable.rb

@@ -1,8 +1,9 @@
+require_relative 'durable/queue_audit_methods'
+
 module Resque
   module Durable
     autoload :GUID,       'resque/durable/guid'
     autoload :Monitor,    'resque/durable/monitor'
-    autoload :QueueAudit, 'resque/durable/queue_audit'
     autoload :BackgroundHeartbeat, 'resque/durable/background_heartbeat'
 
     def self.extended(base)
@@ -86,6 +87,10 @@ module Resque
       @requeue_immediately = true
     end
 
+    def disable_requeue_immediately
+      @requeue_immediately = false
+    end
+
     def build_audit(args)
       auditor.initialize_by_klass_and_args(self, args)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-durable
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Eric Chapweske
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,8 @@ files:
 - lib/resque/durable/background_heartbeat.rb
 - lib/resque/durable/guid.rb
 - lib/resque/durable/monitor.rb
-- lib/resque/durable/queue_audit.rb
+- lib/resque/durable/queue_audit_methods.rb
+- lib/resque/durable/version.rb
 homepage: https://github.com/zendesk/resque-durable
 licenses:
 - MIT
@@ -90,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Resque queue backed by database audits, with automatic retry