Fix potential EMFILE when retrying to connect indefinitely

43fdd059 · Julien Muchembled · 6f86c773 · 43fdd059
Commit 43fdd059 authored Mar 17, 2017 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

neo/lib/event.py neo/lib/event.py +8 -3

No files found.
--- a/neo/lib/event.py
+++ b/neo/lib/event.py
@@ -131,10 +131,15 @@ class EpollEventManager(object):
        else:
            self.reader_set.discard(fd)
            self.writer_set.discard(fd)
+            if close:
+                self._closeAppend(connector.shutdown())
+                if self._closeAcquire(0):
+                    self._closeRelease()
+            return
        if close:
-            self._closeAppend(connector.shutdown())
+            # The connection is not registered, so do not wait for epoll
-            if self._closeAcquire(0):
+            # to wake up (which may not even happen, and lead to EMFILE).
-                self._closeRelease()
+            connector.shutdown()()
    def isIdle(self):
        return not (self._pending_processing or self.writer_set)