From 0cf283f058cfa48e0d3a309aa749357382e1af9c Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Thu, 3 Aug 2017 15:19:57 -0700 Subject: [PATCH] can't see any reason to split the main() like this (anymore?) --- warcprox/main.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/warcprox/main.py b/warcprox/main.py index f5d0597..54355d7 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -262,18 +262,6 @@ def init_controller(args): return controller -def real_main(args): - # see https://github.com/pyca/cryptography/issues/2911 - cryptography.hazmat.backends.openssl.backend.activate_builtin_random() - - controller = init_controller(args) - - signal.signal(signal.SIGTERM, lambda a,b: controller.stop.set()) - signal.signal(signal.SIGINT, lambda a,b: controller.stop.set()) - signal.signal(signal.SIGQUIT, dump_state) - - controller.run_until_shutdown() - def parse_args(argv=sys.argv): ''' Parses command line arguments with argparse. @@ -303,7 +291,16 @@ def main(argv=sys.argv): '%(asctime)s %(process)d %(levelname)s %(threadName)s ' '%(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)s')) - real_main(args) + # see https://github.com/pyca/cryptography/issues/2911 + cryptography.hazmat.backends.openssl.backend.activate_builtin_random() + + controller = init_controller(args) + + signal.signal(signal.SIGTERM, lambda a,b: controller.stop.set()) + signal.signal(signal.SIGINT, lambda a,b: controller.stop.set()) + signal.signal(signal.SIGQUIT, dump_state) + + controller.run_until_shutdown() def ensure_rethinkdb_tables(): '''