Merge 703d28c into ce88693

collectiveidea · May 27, 2015 · 0157b54 · 0157b54
2 parents ce88693 + 703d28c
commit 0157b54
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
@@ -228,7 +228,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