diff options
author | Marcello Stanisci <stanisci.m@gmail.com> | 2017-12-05 21:11:21 +0100 |
---|---|---|
committer | Marcello Stanisci <stanisci.m@gmail.com> | 2017-12-05 21:11:21 +0100 |
commit | a63ac6d6d6e2f6a0956779e06d259423f2f57391 (patch) | |
tree | 09ef0be51964319f1c3301ce660dfa12103a4cdf /taler-bank-manage.in | |
parent | f30b67742643c12c395ac62e747a48a3d0710d98 (diff) | |
download | bank-a63ac6d6d6e2f6a0956779e06d259423f2f57391.tar.gz bank-a63ac6d6d6e2f6a0956779e06d259423f2f57391.tar.bz2 bank-a63ac6d6d6e2f6a0956779e06d259423f2f57391.zip |
linting the launcher
Diffstat (limited to 'taler-bank-manage.in')
-rw-r--r-- | taler-bank-manage.in | 92 |
1 files changed, 43 insertions, 49 deletions
diff --git a/taler-bank-manage.in b/taler-bank-manage.in index 75ba391..2625645 100644 --- a/taler-bank-manage.in +++ b/taler-bank-manage.in @@ -9,6 +9,8 @@ import argparse import sys import os import site +import logging +from talerbank.talerconfig import TalerConfig os.environ.setdefault("TALER_PREFIX", "@prefix@") site.addsitedir("%s/lib/python%d.%d/site-packages" % ( @@ -16,13 +18,11 @@ site.addsitedir("%s/lib/python%d.%d/site-packages" % ( sys.version_info.major, sys.version_info.minor)) -from talerbank.talerconfig import TalerConfig -import logging -logger = logging.getLogger(__name__) - +LOGGER = logging.getLogger(__name__) +TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) # No perfect match to our logging format, but good enough ... -uwsgi_logfmt = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)" +UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)" def handle_django(args): import django @@ -41,100 +41,94 @@ def handle_serve_http(args): call_command('migrate') call_command('provide_accounts') call_command('check') - tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) port = args.port if port is None: - port = tc["bank"]["http_port"].value_int(required=True) + port = TC["bank"]["http_port"].value_int(required=True) httpspec = ":%d" % (port,) params = ["uwsgi", "uwsgi", "--master", "--die-on-term", "--http", httpspec, - "--log-format", uwsgi_logfmt, + "--log-format", UWSGI_LOGFMT, "--wsgi-file", "@prefix@/share/taler-bank/bank.wsgi"] os.execlp(*params) -def handle_serve_uwsgi(args): +def handle_serve_uwsgi(): import django django.setup() from django.core.management import call_command call_command('migrate') call_command('provide_accounts') call_command('check') - tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) - serve_uwsgi = tc["bank"]["uwsgi_serve"].value_string(required=True).lower() + serve_uwsgi = TC["bank"]["uwsgi_serve"].value_string(required=True).lower() params = ["uwsgi", "uwsgi", "--master", "--die-on-term", - "--log-format", uwsgi_logfmt, + "--log-format", UWSGI_LOGFMT, "--wsgi-file", "@prefix@/share/taler-bank/bank.wsgi"] - if "tcp" == serve_uwsgi: - port = tc["bank"]["uwsgi_port"].value_int(required=True) + if serve_uwsgi == "tcp": + port = TC["bank"]["uwsgi_port"].value_int(required=True) spec = ":%d" % (port,) params.extend(["--socket", spec]) else: - spec = tc["bank"]["uwsgi_unixpath"].value_filename(required=True) - mode = tc["bank"]["uwsgi_unixpath_mode"].value_filename(required=True) + spec = TC["bank"]["uwsgi_unixpath"].value_filename(required=True) + mode = TC["bank"]["uwsgi_unixpath_mode"].value_filename(required=True) params.extend(["--socket", spec]) params.extend(["--chmod-socket="+mode]) os.makedirs(os.path.dirname(spec), exist_ok=True) logging.info("launching uwsgi with argv %s", params[1:]) os.execlp(*params) -def handle_sampledata(args): +def handle_sampledata(): import django django.setup() from django.core.management import call_command call_command('sample_donations') def handle_config(args): - from talerbank.talerconfig import TalerConfig - tc = TalerConfig.from_file(args.config) - tc.dump() + TC.from_file(args.config) + TC.dump() -parser = argparse.ArgumentParser() -parser.set_defaults(func=None) -parser.add_argument('--config', '-c', help="configuration file to use", +PARSER = argparse.ArgumentParser() +PARSER.set_defaults(func=None) +PARSER.add_argument('--config', '-c', help="configuration file to use", metavar="CONFIG", type=str, dest="config", default=None) -parser.add_argument('--with-db', help="use 'dbname' (currently only 'dbtype'=='postgres' is supported)", - type=str, metavar="dbtype:///dbname", dest="altdb") -sub = parser.add_subparsers() - -p = sub.add_parser('django', help="Run django-admin command") -p.add_argument("command", nargs=argparse.REMAINDER) -p.set_defaults(func=handle_django) +PARSER.add_argument('--with-db', type=str, metavar="dbtype:///dbname", dest="altdb", + help="use 'dbname' (currently only 'dbtype'=='postgres' is supported)") +SUB = PARSER.add_subparsers() -# FIXME: adapt to newest wire_transfer() -# p = sub.add_parser('sampledata', help="Put sample data into the db") -# p.set_defaults(func=handle_sampledata) +P = SUB.add_parser('django', help="Run django-admin command") +P.add_argument("command", nargs=argparse.REMAINDER) +P.set_defaults(func=handle_django) -p = sub.add_parser('serve-http', help="Serve bank over HTTP") -p.add_argument("--port", "-p", dest="port", type=int, default=None, metavar="PORT") -p.set_defaults(func=handle_serve_http) +P = SUB.add_parser('serve-http', help="Serve bank over HTTP") +P.add_argument("--port", "-p", dest="port", type=int, + default=None, metavar="PORT") +P.set_defaults(func=handle_serve_http) -p = sub.add_parser('serve-uwsgi', help="Serve bank over UWSGI") -p.set_defaults(func=handle_serve_uwsgi) +P = SUB.add_parser('serve-uwsgi', help="Serve bank over UWSGI") +P.set_defaults(func=handle_serve_uwsgi) -p = sub.add_parser('config', help="show config") -p.set_defaults(func=handle_config) +P = SUB.add_parser('config', help="show config") +P.set_defaults(func=handle_config) -args = parser.parse_args() +ARGS = PARSER.parse_args() os.environ.setdefault("DJANGO_SETTINGS_MODULE", "talerbank.settings") -if args.altdb: - logger.info("Setting alternate db: %s" % args.altdb) - os.environ.setdefault("TALER_BANK_ALTDB", args.altdb) +if ARGS.altdb: + LOGGER.info("Setting alternate db: %s" % ARGS.altdb) + os.environ.setdefault("TALER_BANK_ALTDB", ARGS.altdb) -if getattr(args, 'func', None) is None: - parser.print_help() +if getattr(ARGS, 'func', None) is None: + PARSER.print_help() sys.exit(1) -if args.config is not None: - os.environ["TALER_CONFIG_FILE"] = args.config +if ARGS.config is not None: + os.environ["TALER_CONFIG_FILE"] = ARGS.config -args.func(args) +ARGS.func(ARGS) |