Merge pull request #450 from jamutton/master

PR340 made parent and child class methods identical

pika/adapters/base_connection.py

@@ -285,6 +285,9 @@ def _handle_error(self, error_value):
             else:
                 LOGGER.error("SSL Socket error on fd %d: %r",
                              self.socket.fileno(), error_value)
+        elif error_code == errno.EPIPE:
+            # Broken pipe, happens when connection reset
+            LOGGER.error("Socket connection was broken")
         else:
             # Haven't run into this one yet, log it.
             LOGGER.error("Socket Error on fd %d: %s",

pika/adapters/blocking_connection.py

@@ -338,11 +338,6 @@ def _deadline_passed(self, timeout_id):
             return False
         return self._timeouts[timeout_id]['deadline'] <= time.time()
 
-    def _handle_disconnect(self):
-        """Called internally when the socket is disconnected already"""
-        self._adapter_disconnect()
-        self._on_connection_closed(None, True)
-
     def _handle_read(self):
         """If the ReadPoller says there is data to read, try adn read it in the
         _handle_read of the parent class. Once read, reset the counter that
@@ -366,6 +361,15 @@ def _handle_timeout(self):
                 LOGGER.critical('Closing connection due to timeout')
             self._on_connection_closed(None, True)
 
+    def _check_state_on_disconnect(self):
+        """Checks closing corner cases to see why we were disconnected and if we should
+        raise exceptions for the anticipated exception types.
+        """
+        super(BlockingConnection, self)._check_state_on_disconnect()
+        if self.is_open:
+            # already logged a warning in the base class, now fire an exception
+            raise exceptions.ConnectionClosed()
+
     def _flush_outbound(self):
         """Flush the outbound socket buffer."""
         if self.outbound_buffer: