BrokerConnection: wrap socket errors in retriable ConnectionError
This commit is contained in:
@@ -165,7 +165,7 @@ class BrokerConnection(object):
|
|||||||
self._sock.setblocking(False)
|
self._sock.setblocking(False)
|
||||||
except (AssertionError, socket.error) as e:
|
except (AssertionError, socket.error) as e:
|
||||||
log.exception("Error sending %s to %s", request, self)
|
log.exception("Error sending %s to %s", request, self)
|
||||||
self.close(error=e)
|
self.close(error=Errors.ConnectionError(e))
|
||||||
return future.failure(e)
|
return future.failure(e)
|
||||||
log.debug('%s Request %d: %s', self, correlation_id, request)
|
log.debug('%s Request %d: %s', self, correlation_id, request)
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ class BrokerConnection(object):
|
|||||||
return None
|
return None
|
||||||
log.exception('%s: Error receiving 4-byte payload header -'
|
log.exception('%s: Error receiving 4-byte payload header -'
|
||||||
' closing socket', self)
|
' closing socket', self)
|
||||||
self.close(error=e)
|
self.close(error=Errors.ConnectionError(e))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if self._rbuffer.tell() == 4:
|
if self._rbuffer.tell() == 4:
|
||||||
@@ -253,7 +253,7 @@ class BrokerConnection(object):
|
|||||||
if e.errno == errno.EWOULDBLOCK:
|
if e.errno == errno.EWOULDBLOCK:
|
||||||
return None
|
return None
|
||||||
log.exception('%s: Error in recv', self)
|
log.exception('%s: Error in recv', self)
|
||||||
self.close(error=e)
|
self.close(error=Errors.ConnectionError(e))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
staged_bytes = self._rbuffer.tell()
|
staged_bytes = self._rbuffer.tell()
|
||||||
|
|||||||
Reference in New Issue
Block a user