resque-durable 4.0.0 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3928943d5910f0175a2b2155b5bd417bde192e894448a53da76b184c610846b3
-  data.tar.gz: 95a94e3dd8d3c8bddb94ec48739fd2f5f9619c1e63cf497dce3fbe71ccfb1996
+  metadata.gz: 494eb6a3c9e764eb8399ab674687afee948298b85d06c2c7944815762dc0bf9d
+  data.tar.gz: 7be3da9c71fa28a34f2c02d4f56e931b8ca4b3b9c5fd9048682ffa9a3c5ccfcb
 SHA512:
-  metadata.gz: 1d11f968ff7957ed51e96857eafe86ed406152b44a7d9664568eec72a7f0095fca0f08715f6a2b7717cae3c417e0fc85dc9ed352394b560c99678c7137796085
-  data.tar.gz: a2e612f1cbcaf5b00246526ff5160203e2596aaa61cd27cddadb1e09b1692a6a4c8e08c3a3ac14ac986615334b2d4b8a5a59ec379a3f75a39c51f5523ec1449c
+  metadata.gz: e8ae872c2984e06a425167756ec665704b6134a84f854caeb0e069dfe5fa8593370b4fead874901cad9a84c2efeb07675134b01e8006164161dd50614f8018ed
+  data.tar.gz: 599622efbb0b65267558adc279b8431f640fd1fc50f0db3fcc23547ff1b852ebdf28bfd0b4f12744b3a038e81ff9cd6a56cf492025ba8bfb247d72473dc129cb

data/lib/resque/durable/background_heartbeat.rb

@@ -11,6 +11,7 @@ module Resque
         @last_timeout = nil
         @interval     = interval
         @mutex        = Mutex.new
+        @cv           = ConditionVariable.new
         @stop         = false
         @thread       = nil
       end
@@ -51,7 +52,11 @@ module Resque
             heartbeat!
 
             @mutex.synchronize do
-              @mutex.sleep(@interval)
+              end_at = monotonic_now + @interval
+              while !@stop && monotonic_now < end_at
+                sleep_for = end_at - monotonic_now
+                @cv.wait(@mutex, sleep_for)
+              end
             end
           end
         end
@@ -59,12 +64,9 @@ module Resque
 
       def stop_and_wait!
         return unless @thread
+        signal_stop!
         # Prevent deadlock if called by the `heartbeat` thread, which can't wait for itself to die.
-        return signal_stop! if @thread == Thread.current
-        while @thread.alive?
-          signal_stop!
-          sleep 0.01
-        end
+        return if @thread == Thread.current
         @thread.join
         @thread = nil
       end
@@ -74,9 +76,15 @@ module Resque
         return unless @thread
         @mutex.synchronize do
           @stop = true
-          @thread.wakeup
+          @cv.broadcast
         end
       end
+
+      private
+
+      def monotonic_now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
     end
   end
 end

data/lib/resque/durable/queue_audit.rb

@@ -77,7 +77,7 @@ module Resque
       end
 
       def enqueue
-        job_klass.enqueue(*(payload.push(self)))
+        job_klass.enqueue(*(payload.push(becomes(job_klass.auditor))))
       end
 
       def duration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-durable
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.3
 platform: ruby
 authors:
 - Eric Chapweske
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord