Raise a wrapped network error if not threaded

ruby-amqp · Jan 18, 2013 · 3f89a8d · 3f89a8d
1 parent 5e39924
commit 3f89a8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/bunny/exceptions.rb b/lib/bunny/exceptions.rb
@@ -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
diff --git a/lib/bunny/session.rb b/lib/bunny/session.rb
@@ -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)