openstack/deb-python-eventlet
Code Issues Proposed changes

ensure any errors from zmq are raise on thread that called send/recv

Browse Source
This commit is contained in:
Geoff Salmon
2011-09-05 16:45:26 -04:00
parent 6a4333203c
commit 2f7f4302ba
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eventlet/green/zmq.py
View File

@@ -412,13 +412,19 @@ class Socket(__zmq__.Socket):
if e.errno == EAGAIN:
return result
else:
# message failed to send
writers.popleft()
if current is writer:
raise
else:
hub.schedule_call_global(0, writer.throw, e)
continue
except:
writers.popleft()
if current is writer:
raise
else:
hub.schedule_call_global(0, writer.throw, e)
continue
# move to the next msg
writers.popleft()
@@ -456,13 +462,19 @@ class Socket(__zmq__.Socket):
if e.errno == EAGAIN:
return None
else:
# message failed to send
readers.popleft()
if current is reader:
raise
else:
hub.schedule_call_global(0, reader.throw, e)
continue
except:
readers.popleft()
if current is reader:
raise
else:
hub.schedule_call_global(0, reader.throw, e)
continue
# move to the next reader
readers.popleft()