fixed a defect where exceptions in the failure backend would cause th…

…e chile process to terminate like the parent

lib/resque/worker.rb

@@ -162,7 +162,11 @@ def perform(job)
         job.perform
       rescue Object => e
         log "#{job.inspect} failed: #{e.inspect}"
-        job.fail(e)
+        begin
+          job.fail(e)
+        rescue Object => e
+          log "Received exception when reporting failure: #{e.inspect}"
+        end
         failed!
       else
         log "done: #{job.inspect}"

test/test_helper.rb

@@ -114,3 +114,17 @@ def self.perform
     raise SyntaxError, "Extra Bad job!"
   end
 end
+
+class BadFailureBackend < Resque::Failure::Base
+  def save
+    raise Exception.new("Failure backend error")
+  end
+end
+
+def with_failure_backend(failure_backend, &block)
+  previous_backend = Resque::Failure.backend
+  Resque::Failure.backend = failure_backend
+  yield block
+ensure
+  Resque::Failure.backend = previous_backend
+end

test/worker_test.rb

@@ -25,6 +25,13 @@
     assert_equal('Extra Bad job!', Resque::Failure.all['error'])
   end
 
+  test "does not allow exceptions from failure backend to escape" do
+    job = Resque::Job.new(:jobs, {})
+    with_failure_backend BadFailureBackend do
+      @worker.perform job
+    end
+  end
+
   test "fails uncompleted jobs on exit" do
     job = Resque::Job.new(:jobs, [GoodJob, "blah"])
     @worker.working_on(job)