Where possible, don't rescue Exception

This allows single-threaded applications to set a Timeout and be assured that no one will intercept it.
gdb · Jan 18, 2013 · 09fef22 · 09fef22
1 parent 3f89a8d
commit 09fef22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/bunny/session.rb b/lib/bunny/session.rb
@@ -263,7 +263,7 @@ def handle_frame(ch_number, method)
           @event_loop = nil
 
           @transport.close
-        rescue Exception => e
+        rescue StandardError => e
           puts e.class.name
           puts e.message
           puts e.backtrace

diff --git a/lib/bunny/transport.rb b/lib/bunny/transport.rb
@@ -175,7 +175,7 @@ def initialize_socket
           @socket.post_connection_check(host) if @verify_ssl
           @socket
         end
-      rescue Exception => e
+      rescue StandardError, ConnectionTimeout => e
         @status = :not_connected
         raise Bunny::TCPConnectionFailed.new(e, self.hostname, self.port)
       end