Merge pull request collectiveidea#815 from elitau/rescue_exception_in…

…_worker Rescue exception in worker (now with fixed rubocop warning)
efficiency20 · Sep 14, 2015 · 3b07202 · 3b07202
2 parents e81abd1 + 703d28c
commit 3b07202
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb
@@ -229,7 +229,7 @@ def run(job)
     rescue DeserializationError => error
       job.error = error
       failed(job)
-    rescue => error
+    rescue Exception => error # rubocop:disable RescueException
       self.class.lifecycle.run_callbacks(:error, self, job) { handle_failed_job(job, error) }
       return false # work failed
     end

diff --git a/spec/sample_jobs.rb b/spec/sample_jobs.rb
@@ -23,7 +23,7 @@ class ErrorJob
   cattr_accessor :runs
   @runs = 0
   def perform
-    raise 'did not work'
+    raise Exception, 'did not work'
   end
 end