resque-cleaner 0.2.10 → 0.2.11

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.11 (2013-07-19)
+
+* Use transaction for retry-and-clear (#22).
+* Fix for CI
+
 ## 0.2.10 (2012-10-15)
 
 * Bug fix: use URL helper to support resque-web which is not hosted under '/'.

data/lib/resque_cleaner.rb

@@ -118,17 +118,21 @@ module Resque
             if !block_given? || block.call(job)
               index = @limiter.start_index + i - requeued
 
-              if clear_after_requeue
-                # remove job
-                value = redis.lindex(:failed, index)
-                redis.lrem(:failed, 1, value)
-              else
-                # mark retried
-                job['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
-                redis.lset(:failed, @limiter.start_index+i, Resque.encode(job))
+              value = redis.lindex(:failed, index)
+              redis.multi do
+                Job.create(queue||job['queue'], job['payload']['class'], *job['payload']['args'])
+
+                if clear_after_requeue
+                  # remove job
+                  # TODO: should use ltrim. not sure why i used lrem here...
+                  redis.lrem(:failed, 1, value)
+                else
+                  # mark retried
+                  job['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
+                  redis.lset(:failed, @limiter.start_index+i, Resque.encode(job))
+                end
               end
 
-              Job.create(queue||job['queue'], job['payload']['class'], *job['payload']['args'])
               requeued += 1
             end
           end

data/test/dump.rdb

@@ -0,0 +1 @@
+REDIS0002�

data/test/redis-test.conf

@@ -112,4 +112,4 @@ databases 16
 # Glue small output buffers together in order to send small replies in a
 # single TCP packet. Uses a bit more CPU but most of the times it is a win
 # in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+#glueoutputbuf yes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -51,6 +51,7 @@ files:
 - lib/resque_cleaner/server/views/cleaner_list.erb
 - lib/resque_cleaner/server.rb
 - lib/resque_cleaner.rb
+- test/dump.rdb
 - test/redis-test.conf
 - test/resque_cleaner_test.rb
 - test/resque_web_test.rb