Don't use deprecated Redis methods (incr => incrby, flush_all => flushall)

Author: defunkt

lib/resque/stat.rb

@@ -24,7 +24,7 @@ def [](stat)
     # Can optionally accept a second int parameter. The stat is then
     # incremented by that amount.
     def incr(stat, by = 1)
-      redis.incr("stat:#{stat}", by)
+      redis.incrby("stat:#{stat}", by)
     end
 
     # Increments a stat by one.
@@ -37,7 +37,7 @@ def <<(stat)
     # Can optionally accept a second int parameter. The stat is then
     # decremented by that amount.
     def decr(stat, by = 1)
-      redis.decr("stat:#{stat}", by)
+      redis.decrby("stat:#{stat}", by)
     end
 
     # Decrements a stat by one.

lib/resque/worker.rb

@@ -328,7 +328,8 @@ def run_hook(name, *args)
     def unregister_worker
       # If we're still processing a job, make sure it gets logged as a
       # failure.
-      if job
+      if (hash = processing) && !hash.empty?
+        job = Job.new(hash['queue'], hash['payload'])
         # Ensure the proper worker is attached to this job, even if
         # it's not the precise instance that died.
         job.worker = self

test/resque_test.rb

@@ -2,7 +2,7 @@
 
 context "Resque" do
   setup do
-    Resque.redis.flush_all
+    Resque.redis.flushall
 
     Resque.push(:people, { 'name' => 'chris' })
     Resque.push(:people, { 'name' => 'bob' })
@@ -166,7 +166,7 @@
   end
 
   test "queues are always a list" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     assert_equal [], Resque.queues
   end
 
@@ -217,7 +217,7 @@
     assert_equal 1, stats[:failed]
     assert_equal ['localhost:9736'], stats[:servers]
   end
-  
+
   test "decode bad json" do
     assert_nil Resque.decode("{\"error\":\"Module not found \\u002\"}")
   end

test/worker_test.rb

@@ -2,7 +2,7 @@
 
 context "Resque::Worker" do
   setup do
-    Resque.redis.flush_all
+    Resque.redis.flushall
 
     Resque.before_first_fork = nil
     Resque.before_fork = nil
@@ -18,13 +18,20 @@
     assert_equal 1, Resque::Failure.count
   end
 
-  test "failed jobs report excpetion and message" do
+  test "failed jobs report exception and message" do
     Resque::Job.create(:jobs, BadJobWithSyntaxError)
     @worker.work(0)
     assert_equal('SyntaxError', Resque::Failure.all['exception'])
     assert_equal('Extra Bad job!', Resque::Failure.all['error'])
   end
 
+  test "fails uncompleted jobs on exit" do
+    job = Resque::Job.new(:jobs, [GoodJob, "blah"])
+    @worker.working_on(job)
+    @worker.unregister_worker
+    assert_equal 1, Resque::Failure.count
+  end
+
   test "can peek at failed jobs" do
     10.times { Resque::Job.create(:jobs, BadJob) }
     @worker.work(0)
@@ -253,7 +260,7 @@
   end
 
   test "Will call a before_first_fork hook only once" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $BEFORE_FORK_CALLED = 0
     Resque.before_first_fork = Proc.new { $BEFORE_FORK_CALLED += 1 }
     workerA = Resque::Worker.new(:jobs)
@@ -270,7 +277,7 @@
   end
 
   test "Will call a before_fork hook before forking" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $BEFORE_FORK_CALLED = false
     Resque.before_fork = Proc.new { $BEFORE_FORK_CALLED = true }
     workerA = Resque::Worker.new(:jobs)
@@ -282,7 +289,7 @@
   end
 
   test "Will call an after_fork hook after forking" do
-    Resque.redis.flush_all
+    Resque.redis.flushall
     $AFTER_FORK_CALLED = false
     Resque.after_fork = Proc.new { $AFTER_FORK_CALLED = true }
     workerA = Resque::Worker.new(:jobs)