Permalink
Browse files

Merge branch 'master' of github.com:ruby-amqp/bunny

  • Loading branch information...
2 parents 9d4cce0 + be122a2 commit ad6ab46a149c5188a95b6853d2dc39d1fb4bd616 Michael Klishin committed Jan 18, 2013
Showing with 13 additions and 2 deletions.
  1. +9 −0 lib/bunny/exceptions.rb
  2. +3 −1 lib/bunny/session.rb
  3. +1 −1 lib/bunny/transport.rb
View
@@ -136,4 +136,13 @@ class InvalidCommand < ConnectionLevelException
class UnexpectedFrame < ConnectionLevelException
end
+
+ class NetworkErrorWrapper < StandardError
+ attr_reader :other
+
+ def initialize(other)
+ super(other.message)
+ @other = other
+ end
+ end
end
View
@@ -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
@@ -309,6 +309,8 @@ def handle_frameset(ch_number, frames)
end
def handle_network_failure(exception)
+ raise NetworkErrorWrapper.new(exception) unless @threaded
+
if !recovering_from_network_failure?
@recovering_from_network_failure = true
if recoverable_network_failure?(exception)
View
@@ -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

0 comments on commit ad6ab46

Please sign in to comment.