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 #1201 from bloodearnest/double_exc

Browse Source 
Clean up traceback printing in arbitar
This commit is contained in:
Benoit Chesneau 2016-02-09 16:40:54 +01:00
commit a3e3ee8fda
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gunicorn/arbiter.py
View File

@ -207,8 +207,8 @@ class Arbiter(object):
except SystemExit: except SystemExit:
raise raise
except Exception: except Exception:
self.log.info("Unhandled exception in main loop:\n%s", self.log.info("Unhandled exception in main loop",
traceback.format_exc()) exc_info=1)
self.stop(False) self.stop(False)
if self.pidfile is not None: if self.pidfile is not None:
self.pidfile.unlink() self.pidfile.unlink()
@ -518,14 +518,13 @@ class Arbiter(object):
except SystemExit: except SystemExit:
raise raise
except AppImportError as e: except AppImportError as e:
self.log.debug("Exception while loading the application: \n%s", self.log.debug("Exception while loading the application",
traceback.format_exc()) exc_info=1)
print("%s" % e, file=sys.stderr) print("%s" % e, file=sys.stderr)
sys.stderr.flush() sys.stderr.flush()
sys.exit(self.APP_LOAD_ERROR) sys.exit(self.APP_LOAD_ERROR)
except: except:
self.log.exception("Exception in worker process:\n%s", self.log.exception("Exception in worker process"),
traceback.format_exc())
if not worker.booted: if not worker.booted:
sys.exit(self.WORKER_BOOT_ERROR) sys.exit(self.WORKER_BOOT_ERROR)
sys.exit(-1) sys.exit(-1)