diff --git a/setup.py b/setup.py index 5052a64..4fa0885 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ except: setuptools.setup( name='warcprox', - version='2.4b7.dev196', + version='2.4b7.dev197', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/main.py b/warcprox/main.py index e38bb02..7fe5011 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -316,7 +316,11 @@ def main(argv=None): # SIGQUIT does not exist on some platforms (windows) pass - controller.run_until_shutdown() + try: + controller.run_until_shutdown() + except: + logging.fatal('unhandled exception in controller', exc_info=True) + sys.exit(1) def ensure_rethinkdb_tables(argv=None): '''