Fix timeouts for async workers.

tilgovi · Jul 9, 2010 · a9c916f · a9c916f
1 parent 3b8a74f
commit a9c916f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/gunicorn/workers/async.py b/gunicorn/workers/async.py
@@ -21,15 +21,19 @@ def __init__(self, *args, **kwargs):
         self.worker_connections = self.cfg.worker_connections
 
     def timeout_ctx(self):
-        return self.parser.next()
+        raise NotImplemented()
 
     def handle(self, client, addr):
         try:
             try:
                 parser = http.RequestParser(client)
                 try:
                     while True:
-                        req = self.timeout_ctx()           
+                        timeout = self.timeout_ctx()
+                        try:
+                            req = parser.next()
+                        finally:
+                            timeout.cancel()
                         if not req:
                             break
                         self.handle_request(req, client, addr)

diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py
@@ -30,14 +30,7 @@ def init_process(self):
         super(EventletWorker, self).init_process()
 
     def timeout_ctx(self):
-        timeout = eventlet.Timeout(self.cfg.keepalive)
-        try:
-            try:
-                return super(timeout_ctx, self)()
-            except eventlet.Timeout, t:
-                pass
-        finally:
-            timeout.cancel()
+        return eventlet.Timeout(self.cfg.keepalive)
 
     def run(self):
         self.socket.setblocking(1)

diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py
@@ -23,10 +23,8 @@ def setup(cls):
 
     def timeout_ctx(self):
         timeout = gevent.Timeout(self.cfg.keepalive)
-        try:
-            return super(GEventWorker, self).timeout_ctx()
-        except gevent.Timeout:
-            return None
+        timeout.start()
+        return timeout
 
     def run(self):
         self.socket.setblocking(1)