openstack/deb-python-kafka
Code Issues Proposed changes

Handle windows socket error codes in BrokerConnection

Browse Source
This commit is contained in:
Dana Powers
2016-03-17 11:04:26 -07:00
parent 16a013e207
commit f39f461918
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kafka/conn.py
View File

@@ -90,9 +90,10 @@ class BrokerConnection(object):
pass
self.last_attempt = time.time()
if not ret or ret is errno.EISCONN:
if not ret or ret == errno.EISCONN:
self.state = ConnectionStates.CONNECTED
elif ret in (errno.EINPROGRESS, errno.EALREADY):
# WSAEINVAL == 10022, but errno.WSAEINVAL is not available on non-win systems
elif ret in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK, 10022):
self.state = ConnectionStates.CONNECTING
else:
log.error('Connect attempt to %s returned error %s.'
@@ -114,9 +115,10 @@ class BrokerConnection(object):
ret = self._sock.connect_ex((self.host, self.port))
except socket.error as ret:
pass
if not ret or ret is errno.EISCONN:
if not ret or ret == errno.EISCONN:
self.state = ConnectionStates.CONNECTED
elif ret is not errno.EALREADY:
# WSAEINVAL == 10022, but errno.WSAEINVAL is not available on non-win systems
elif ret not in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK, 10022):
log.error('Connect attempt to %s returned error %s.'
' Disconnecting.', self, ret)
self.close()