Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eventio: Fixes select bad file descriptor handling

This commit is contained in:
Ask Solem 2013-04-24 16:44:41 +01:00
parent deadff9a60
commit d31a9eacb6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kombu/utils/eventio.py
View File

@ -198,7 +198,7 @@ class _select(Poller):
for fd in self._rfd | self._wfd | self._efd:
try:
_selectf([fd], [], [], 0)
except _selecterr, exc:
except (_selecterr, socket.error), exc:
if get_errno(exc) in SELECT_BAD_FD:
self.unregister(fd)
@ -212,11 +212,12 @@ class _select(Poller):
read, write, error = _selectf(
self._rfd, self._wfd, self._efd, timeout,
)
except _selecterr, exc:
except (_selecterr, socket.error), exc:
if get_errno(exc) == errno.EINTR:
return
elif get_errno(exc) in SELECT_BAD_FD:
self._remove_bad()
return self._remove_bad()
raise
events = {}
for fd in read: