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

Merge pull request #1052 from jaingaurav/oserror

Browse Source 
Catch OSError as well as ValueError on race condition
This commit is contained in:
Berker Peksag 2015-06-22 13:41:48 +03:00
commit d478968d59
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gunicorn/arbiter.py
View File

@ -45,7 +45,7 @@ class Arbiter(object):
# I love dynamic languages
SIG_QUEUE = []
SIGNALS = [getattr(signal, "SIG%s" % x)
for x in "HUP QUIT INT TERM TTIN TTOU USR1 USR2 WINCH".split()]
for x in "HUP QUIT INT TERM TTIN TTOU USR1 USR2 WINCH".split()]
SIG_NAMES = dict(
(getattr(signal, name), name[3:].lower()) for name in dir(signal)
if name[:3] == "SIG" and name[3] != "_"
@ -203,7 +203,7 @@ class Arbiter(object):
raise
except Exception:
self.log.info("Unhandled exception in main loop:\n%s",
traceback.format_exc())
traceback.format_exc())
self.stop(False)
if self.pidfile is not None:
self.pidfile.unlink()
@ -429,7 +429,7 @@ class Arbiter(object):
try:
if time.time() - worker.tmp.last_update() <= self.timeout:
continue
except ValueError:
except (OSError, ValueError):
continue
if not worker.aborted:
@ -510,13 +510,13 @@ class Arbiter(object):
raise
except AppImportError as e:
self.log.debug("Exception while loading the application: \n%s",
traceback.format_exc())
traceback.format_exc())
print("%s" % e, file=sys.stderr)
sys.stderr.flush()
sys.exit(self.APP_LOAD_ERROR)
except:
self.log.exception("Exception in worker process:\n%s",
traceback.format_exc())
traceback.format_exc())
if not worker.booted:
sys.exit(self.WORKER_BOOT_ERROR)
sys.exit(-1)