diff --git a/gunicorn/workers/async.py b/gunicorn/workers/async.py index 565c696b..ff944431 100644 --- a/gunicorn/workers/async.py +++ b/gunicorn/workers/async.py @@ -21,7 +21,7 @@ class AsyncWorker(Worker): Worker.__init__(self, *args, **kwargs) self.worker_connections = self.cfg.worker_connections - def timeout(self): + def timeout_ctx(self): raise NotImplementedError() def handle(self, client, addr): @@ -30,7 +30,7 @@ class AsyncWorker(Worker): try: while True: req = None - with self.timeout(): + with self.timeout_ctx(): req = parser.next() if not req: break @@ -45,8 +45,6 @@ class AsyncWorker(Worker): self.log.warn("Ignoring connection reset") else: self.log.warn("Ignoring EPIPE") - except UnexpectedEOF: - self.log.exception("Client closed the connection unexpectedly.") except Exception, e: self.log.exception("General error processing request.") try: diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py index e2e462d3..92adc6bc 100644 --- a/gunicorn/workers/geventlet.py +++ b/gunicorn/workers/geventlet.py @@ -31,8 +31,8 @@ class EventletWorker(AsyncWorker): def init_process(self): hubs.use_hub() super(EventletWorker, self).init_process() - - def timeout(self): + + def timeout_ctx(self): return eventlet.Timeout(self.cfg.keepalive, False) def run(self): diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py index b2e3b5ee..565903d0 100644 --- a/gunicorn/workers/ggevent.py +++ b/gunicorn/workers/ggevent.py @@ -22,7 +22,7 @@ class GEventWorker(AsyncWorker): from gevent import monkey monkey.patch_all(dns=False) - def timeout(self): + def timeout_ctx(self): return gevent.Timeout(self.cfg.keepalive, False) def run(self):