Fix eventlet graceful timeout handling

The `StopServer` exception can lead to a handler blocked waiting for
an available greenthread to never be processed.
This change ensures we attempt to handle any accepted socket connection
within the graceful timeout period.

gunicorn/workers/async.py

@@ -36,7 +36,7 @@ def handle(self, listener, client, addr):
         try:
             parser = http.RequestParser(self.cfg, client)
             try:
-                listener_name = listener.getsockname()
+                listener_name = client.getsockname()
                 if not self.cfg.keepalive:
                     req = six.next(parser)
                     self.handle_request(listener_name, req, client, addr)

gunicorn/workers/geventlet.py

@@ -48,13 +48,18 @@ def _eventlet_serve(sock, handle, concurrency):
     pool = eventlet.greenpool.GreenPool(concurrency)
     server_gt = eventlet.greenthread.getcurrent()
 
+    def _eventlet_handle(conn, addr):
+        gt = pool.spawn(handle, conn, addr)
+        gt.link(_eventlet_stop, server_gt, conn)
+
     while True:
         try:
             conn, addr = sock.accept()
-            gt = pool.spawn(handle, conn, addr)
-            gt.link(_eventlet_stop, server_gt, conn)
-            conn, addr, gt = None, None, None
+            _eventlet_handle(conn, addr)
+            conn, addr = None, None
         except eventlet.StopServe:
+            if conn and addr:
+                _eventlet_handle(conn, addr)
             sock.close()
             pool.waitall()
             return
@@ -123,7 +128,8 @@ def run(self):
         for sock in self.sockets:
             gsock = GreenSocket(sock)
             gsock.setblocking(1)
-            hfun = partial(self.handle, gsock)
+            listener_name = gsock.getsockname()
+            hfun = partial(self.handle, listener_name)
             acceptor = eventlet.spawn(_eventlet_serve, gsock, hfun,
                                       self.worker_connections)