resque-retry 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d34a270a535f97586c21a6c259d780c7a1ce9f
-  data.tar.gz: 9ab5f4591d2a99e262cc1ab2501d70e845f710aa
+  metadata.gz: a1679744710a2e1d18001de39c1171cf671f1ef8
+  data.tar.gz: 0fa6ac27d73a17b22602062250f8048374a3e274
 SHA512:
-  metadata.gz: 03b4b70d9ef0e69d46d738fb3b6c1dd987e3e0e46cf3a2724300b50e1fbdcfc9f44d2af1b18b53999a21e74d48e335fe1a689e9885e14e784070ad5384f1fcac
-  data.tar.gz: 781a313ebd129ad8db24df9822b47bec750879aa2fa1abcc524df00228767c6a50eca03c780b19aee8e576304fcb294fe83f963af8fb75beacf4cb89b3f631fb
+  metadata.gz: 585ad0f3aff31ea85fb335b552e873210bb2c9d931e3e4dd8d36165903e89cf188bea91bcce1a6ddea6b6189de13287d5e867d3b3aa61d9edbfe33b791d4ec92
+  data.tar.gz: bae8d6b35f22d5878c1acda5ae1e48f9d406a4637ed0d9ea29fd39c1f49f894ddca41a2c05fda9d3fbc26a9f29ef9a31e9bb33dd55e1db7150d004a21b530389

data/HISTORY.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 1.3.1 (2014-08-13)
+
+* Fixed: Job would infinitely retry if DirtyExit exception was always raised.
+
 ## 1.3.0 (2014-07-25)
 
 * Adjust gem dependency on `resque-scheduler` to ~> 3.0

data/lib/resque/plugins/retry.rb

@@ -410,9 +410,13 @@ module Resque
       # @api private
       def on_failure_retry(exception, *args)
         log_message 'on_failure_retry', args, exception
-        if @on_failure_retry_hook_already_called
+        if exception.is_a?(Resque::DirtyExit)
+          # This hook is called from a worker processes, not the job process
+          # that failed with a DirtyExit, so @retry_attempt wasn't set yet
+          @retry_attempt = Resque.redis.get(redis_retry_key(*args)).to_i
+        elsif @on_failure_retry_hook_already_called
           log_message 'on_failure_retry_hook_already_called', args, exception
-          return 
+          return
         end
 
         if retry_criteria_valid?(exception, *args)

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/test/retry_test.rb

@@ -312,4 +312,22 @@ class RetryTest < MiniTest::Unit::TestCase
       perform_next_job(@worker)
     end
   end
+
+  if Process.respond_to?(:fork) && Gem::Version.new(Resque::VERSION) >= Gem::Version.new('1.20.0')
+    def test_retry_on_dirty_exit
+      Resque.enqueue(RetryKilledJob)
+      RetryKilledJob.expects(:clean_retry_key).once
+      2.times do
+        job = @worker.reserve
+        child = fork do
+          Resque.redis.client.reconnect
+          job.perform
+        end
+        Process.waitpid(child)
+        job.fail(Resque::DirtyExit.new)
+      end
+
+      assert_equal nil, @worker.reserve
+    end
+  end
 end

data/test/test_jobs.rb

@@ -503,3 +503,12 @@ class FailsDuringConnectJob < RetryDefaultsJob
   @retry_limit = 3
   @retry_delay = 10
 end
+
+class RetryKilledJob
+  extend Resque::Plugins::Retry
+  @queue = :testing
+
+  def self.perform(*args)
+    Process.kill("KILL", Process.pid)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for