jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix exceptions

Browse Source
This commit is contained in:
benoitc 2012-10-24 14:03:18 +02:00
parent 64371a0858
commit 039bf47c3d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gunicorn/workers/sync.py
View File

@ -40,8 +40,8 @@ class SyncWorker(base.Worker):
# process. # process.
continue continue
except socket.error, e: except socket.error as e:
if e[0] not in (errno.EAGAIN, errno.ECONNABORTED): if e.args[0] not in (errno.EAGAIN, errno.ECONNABORTED):
raise raise
# If our parent changed then we shut down. # If our parent changed then we shut down.
@ -54,10 +54,10 @@ class SyncWorker(base.Worker):
ret = select.select([self.socket], [], self.PIPE, self.timeout) ret = select.select([self.socket], [], self.PIPE, self.timeout)
if ret[0]: if ret[0]:
continue continue
except select.error, e: except select.error as e:
if e[0] == errno.EINTR: if e.args[0] == errno.EINTR:
continue continue
if e[0] == errno.EBADF: if e.args[0] == errno.EBADF:
if self.nr < 0: if self.nr < 0:
continue continue
else: else:
@ -71,18 +71,18 @@ class SyncWorker(base.Worker):
parser = http.RequestParser(self.cfg, client) parser = http.RequestParser(self.cfg, client)
req = parser.next() req = parser.next()
self.handle_request(req, client, addr) self.handle_request(req, client, addr)
except http.errors.NoMoreData, e: except http.errors.NoMoreData as e:
self.log.debug("Ignored premature client disconnection. %s", e) self.log.debug("Ignored premature client disconnection. %s", e)
except StopIteration, e: except StopIteration as e:
self.log.debug("Closing connection. %s", e) self.log.debug("Closing connection. %s", e)
except socket.timeout as e: except socket.timeout as e:
self.handle_error(req, client, addr, e) self.handle_error(req, client, addr, e)
except socket.error, e: except socket.error as e:
if e[0] != errno.EPIPE: if e.args[0] != errno.EPIPE:
self.log.exception("Error processing request.") self.log.exception("Error processing request.")
else: else:
self.log.debug("Ignoring EPIPE") self.log.debug("Ignoring EPIPE")
except Exception, e: except Exception as e:
self.handle_error(req, client, addr, e) self.handle_error(req, client, addr, e)
finally: finally:
util.close(client) util.close(client)
@ -117,7 +117,7 @@ class SyncWorker(base.Worker):
respiter.close() respiter.close()
except socket.error: except socket.error:
raise raise
except Exception, e: except Exception as e:
# Only send back traceback in HTTP in debug mode. # Only send back traceback in HTTP in debug mode.
self.handle_error(req, client, addr, e) self.handle_error(req, client, addr, e)
return return