backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

can't see any reason to split the main() like this (anymore?)

Browse Source
This commit is contained in:
Noah Levitt 2017-08-03 15:19:57 -07:00
parent 027a242e19
commit 0cf283f058
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
warcprox/main.py
View File

@ -262,18 +262,6 @@ def init_controller(args):
return controller 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): def parse_args(argv=sys.argv):
''' '''
Parses command line arguments with argparse. Parses command line arguments with argparse.
@ -303,7 +291,16 @@ def main(argv=sys.argv):
'%(asctime)s %(process)d %(levelname)s %(threadName)s ' '%(asctime)s %(process)d %(levelname)s %(threadName)s '
'%(name)s.%(funcName)s(%(filename)s:%(lineno)d) %(message)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(): def ensure_rethinkdb_tables():
''' '''