onyx-resque-retry 0.1.2 → 0.1.3

data/lib/resque/plugins/retry.rb

@@ -179,13 +179,19 @@ module Resque
 
       # Will retry the job.
       def try_again(*args)
-        @retry_job_class ||= self
+        retry_in_queue = @retry_job_class ? @retry_job_class : self
         if retry_delay <= 0
           # If the delay is 0, no point passing it through the scheduler
-          Resque.enqueue(@retry_job_class, *args_for_retry(*args))
+          Resque.enqueue(retry_in_queue, *args_for_retry(*args))
         else
-          Resque.enqueue_in(retry_delay, @retry_job_class, *args_for_retry(*args))
+          Resque.enqueue_in(retry_delay, retry_in_queue, *args_for_retry(*args))
         end
+
+        clean_retry_key(args) if @retry_job_class
+      end
+
+      def clean_retry_key(*args)
+        Resque.redis.del(redis_retry_key(*args))
       end
 
       # Resque before_perform hook.

data/test/retry_test.rb

@@ -123,9 +123,10 @@ class RetryTest < Test::Unit::TestCase
 
     assert job_from_retry_queue = Resque.pop(:testing_retry)
     assert_equal ['arg1'], job_from_retry_queue['args']
+    assert_equal nil, Resque.redis.get(JobWithRetryQueue.redis_retry_key('arg1'))
   end
 
-  def test_retry_failed_jobs_in_separate_queue
+  def test_retry_delayed_failed_jobs_in_separate_queue
     Resque.enqueue(DelayedJobWithRetryQueue, 'arg1')
     Resque.expects(:enqueue_in).with(1, JobRetryQueue, 'arg1')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: onyx-resque-retry
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Luke Antins