Merge pull request #4 from zopefoundation/patrick-fix-fd-leak

fix a file descriptor leak

src/zc/resumelb/tests.py

@@ -401,6 +401,27 @@ def dont_reset_worker_backlogs_if_they_already_have_them():
     9
     """
 
+def worker_closes_socket():
+    """
+
+Disconnecting from a worker does not leak a file descriptor.
+
+    >>> worker = zc.resumelb.worker.Worker(
+    ...   zc.resumelb.tests.app(), ('127.0.0.1', 0))
+    >>> import gevent
+    >>> import gevent.socket
+    >>> sock = gevent.socket.create_connection(worker.addr)
+
+
+    >>> gevent.sleep(0.1)
+    >>> conn = list(worker.connections)[0]
+    >>> sock.close()
+    >>> gevent.sleep(0.1)
+
+    >>> conn.socket # doctest: +ELLIPSIS
+    <socket at 0x... fileno=[Errno 9] Bad file descriptor>
+    """
+
 def test_classifier(env):
     return "yup, it's a test"
 

src/zc/resumelb/util.py

@@ -237,6 +237,7 @@ def connected(self, socket, addr=None):
         gevent.Greenlet.spawn(writer, writeq, socket, self)
         self.put = writeq.put
         self.is_connected = True
+        self.socket = socket
         return self.readers
 
     def __len__(self):
@@ -261,6 +262,7 @@ def disconnected(self):
         self.is_connected = False
         for put in self.readers.itervalues():
             put(None)
+        self.socket.close()
 
         self.put = self.put_disconnected