From 1d3401afd6fc055ccde5dcd1d13edc081ec11a8d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 29 Aug 2012 20:20:20 -0700
Subject: [PATCH] Fix a few more Exception leaks

---
 lib/sidekiq/middleware/server/logging.rb    | 2 +-
 lib/sidekiq/middleware/server/retry_jobs.rb | 6 +++---
 lib/sidekiq/util.rb                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/sidekiq/middleware/server/logging.rb b/lib/sidekiq/middleware/server/logging.rb
index a70fd04f..343dfdd3 100644
--- a/lib/sidekiq/middleware/server/logging.rb
+++ b/lib/sidekiq/middleware/server/logging.rb
@@ -10,7 +10,7 @@ module Sidekiq
               logger.info { "start" }
               yield
               logger.info { "done: #{elapsed(start)} sec" }
-            rescue
+            rescue Exception
               logger.info { "fail: #{elapsed(start)} sec" }
               raise
             end
diff --git a/lib/sidekiq/middleware/server/retry_jobs.rb b/lib/sidekiq/middleware/server/retry_jobs.rb
index c847d0c8..e40bd366 100644
--- a/lib/sidekiq/middleware/server/retry_jobs.rb
+++ b/lib/sidekiq/middleware/server/retry_jobs.rb
@@ -40,8 +40,8 @@ module Sidekiq
 
         def call(worker, msg, queue)
           yield
-        rescue => e
-          raise unless msg['retry']
+        rescue Exception => e
+          raise e unless msg['retry']
 
           msg['queue'] = queue
           msg['error_message'] = e.message
@@ -72,7 +72,7 @@ module Sidekiq
             # Goodbye dear message, you (re)tried your best I'm sure.
             logger.debug { "Dropping message after hitting the retry maximum: #{msg}" }
           end
-          raise
+          raise e
         end
 
       end
diff --git a/lib/sidekiq/util.rb b/lib/sidekiq/util.rb
index 87766082..54dd329f 100644
--- a/lib/sidekiq/util.rb
+++ b/lib/sidekiq/util.rb
@@ -22,7 +22,7 @@ module Sidekiq
 
     def watchdog(last_words)
       yield
-    rescue => ex
+    rescue Exception => ex
       handle_exception(ex, { :context => last_words })
     end