openstack/deb-python-eventlet
Code Issues Proposed changes

fix implementation of connect_ex so it always returns the error code rather than raising

Browse Source
This commit is contained in:
Tavis Rudd
2010-02-24 19:49:21 -08:00
parent a0ab236669
commit 8072243926
1 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eventlet/greenio.py
View File

@@ -195,11 +195,11 @@ class GreenSocket(object):
else: else:
end = time.time() + self.gettimeout() end = time.time() + self.gettimeout()
while True: while True:
try:
if socket_connect(fd, address): if socket_connect(fd, address):
return 0 return 0
if time.time() >= end: if time.time() >= end:
raise socket.timeout(errno.EAGAIN) raise socket.timeout(errno.EAGAIN)
try:
trampoline(fd, write=True, timeout=end-time.time(), trampoline(fd, write=True, timeout=end-time.time(),
timeout_exc=socket.timeout(errno.EAGAIN)) timeout_exc=socket.timeout(errno.EAGAIN))
except socket.error, ex: except socket.error, ex:
@@ -589,4 +589,3 @@ def serve(sock, handle, concurrency=1000):
connections until the existing ones complete. connections until the existing ones complete.
""" """
pass pass