From 38d6e4337d13fe9238fc48716cdf5aa773941d7d Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 24 Apr 2019 13:14:12 -0700 Subject: [PATCH] handle graceful shutdown failure print stack trace and kill myself -9 --- setup.py | 2 +- warcprox/controller.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bbdd9bd..75177d8 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ except: setuptools.setup( name='warcprox', - version='2.4.7', + version='2.4.8', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/controller.py b/warcprox/controller.py index fcdaa58..9a2880e 100644 --- a/warcprox/controller.py +++ b/warcprox/controller.py @@ -441,7 +441,12 @@ class WarcproxController(object): exc_info=True) pass finally: - self.shutdown() + try: + self.shutdown() + except: + self.logger.critical("graceful shutdown failed", exc_info=True) + self.logger.critical("killing myself -9") + os.kill(os.getpid(), 9) def _dump_profiling(self): import pstats, tempfile, os, io