fix async keep-alive timeout noise

tilgovi · Sep 20, 2011 · 0efcade · 0efcade
1 parent 05f0222
commit 0efcade
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gunicorn/workers/async.py b/gunicorn/workers/async.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 import errno
 import socket
+import sys
 
 import gunicorn.http as http
 import gunicorn.http.wsgi as wsgi
@@ -21,7 +22,7 @@ def __init__(self, *args, **kwargs):
         self.worker_connections = self.cfg.worker_connections
 
     def timeout_ctx(self):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def handle(self, client, addr):
         try:
@@ -32,7 +33,11 @@ def handle(self, client, addr):
                         timeout = self.timeout_ctx()
                         req = None
                         try:
-                            req = parser.next()
+                            try:
+                                req = parser.next()
+                            except:
+                                if sys.exc_info()[1] is not timeout:
+                                    raise
                         finally:
                             timeout.cancel()
                         if not req:

diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
@@ -30,7 +30,7 @@ def init_process(self):
         super(EventletWorker, self).init_process()
 
     def timeout_ctx(self):
-        return eventlet.Timeout(self.cfg.keepalive)
+        return eventlet.Timeout(self.cfg.keepalive, False)
 
     def run(self):
         self.socket = GreenSocket(family_or_realsock=self.socket.sock)

diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py
@@ -49,10 +49,10 @@ def setup(cls):
 
 
     def timeout_ctx(self):
-        timeout = gevent.Timeout(self.cfg.keepalive)
+        timeout = gevent.Timeout(self.cfg.keepalive, False)
         timeout.start()
         return timeout
-        
+
     def run(self):
         self.socket.setblocking(1)