[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-backoffice] 21/31: linting the launcher
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-backoffice] 21/31: linting the launcher |
Date: |
Thu, 04 Jan 2018 18:09:44 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository backoffice.
commit 5a3c712ccea6e58fd0eaa0cc3804d63097f1312b
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Dec 5 20:59:55 2017 +0100
linting the launcher
---
taler-merchant-blog.in | 79 ++++++++++++++++++++++++++------------------------
1 file changed, 41 insertions(+), 38 deletions(-)
diff --git a/taler-merchant-blog.in b/taler-merchant-blog.in
index 523b683..4a1acb0 100644
--- a/taler-merchant-blog.in
+++ b/taler-merchant-blog.in
@@ -4,53 +4,52 @@
Stand-alone script to manage the GNU Taler blog frontend.
"""
+import logging
import argparse
import sys
import os
import site
+from talerblog.talerconfig import TalerConfig
os.environ.setdefault("TALER_PREFIX", "@prefix@")
site.addsitedir("%s/lib/python%d.%d/site-packages" % (
- "@prefix@",
+ "@prefix@",
sys.version_info.major,
sys.version_info.minor))
-from talerblog.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_serve_http(args):
- tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
port = args.port
if port is None:
- port = tc["blog"]["http_port"].value_int(required=True)
+ port = TC["blog"]["http_port"].value_int(required=True)
spec = ":%d" % (port,)
os.execlp("uwsgi", "uwsgi",
- "--master",
- "--die-on-term",
- "--log-format", uwsgi_logfmt,
- "--http", spec,
- "--wsgi-file", "@prefix@/share/taler/frontend-blog.wsgi")
-
-def handle_serve_uwsgi(args):
- tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
- serve_uwsgi = tc["blog"]["uwsgi_serve"].value_string(required=True).lower()
+ "--master",
+ "--die-on-term",
+ "--log-format", UWSGI_LOGFMT,
+ "--http", spec,
+ "--wsgi-file", "@prefix@/share/taler/frontend-blog.wsgi")
+
+def handle_serve_uwsgi():
+ serve_uwsgi = TC["blog"]["uwsgi_serve"].value_string(required=True).lower()
params = ["uwsgi", "uwsgi",
- "--master",
- "--die-on-term",
- "--log-format", uwsgi_logfmt,
- "--wsgi-file", "@prefix@/share/taler/frontend-blog.wsgi"]
+ "--master",
+ "--die-on-term",
+ "--log-format", UWSGI_LOGFMT,
+ "--wsgi-file", "@prefix@/share/taler/frontend-blog.wsgi"]
if serve_uwsgi == "tcp":
- port = tc["blog"]["uwsgi_port"].value_int(required=True)
+ port = TC["blog"]["uwsgi_port"].value_int(required=True)
spec = ":%d" % (port,)
params.extend(["--socket", spec])
elif serve_uwsgi == "unix":
- spec = tc["blog"]["uwsgi_unixpath"].value_filename(required=True)
- mode = tc["blog"]["uwsgi_unixpath_mode"].value_filename(required=True)
+ spec = TC["blog"]["uwsgi_unixpath"].value_filename(required=True)
+ mode = TC["blog"]["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)
@@ -59,24 +58,28 @@ def handle_serve_uwsgi(args):
-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)
-sub = parser.add_subparsers()
+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)
+SUB = PARSER.add_subparsers()
-p = sub.add_parser('serve-http', help="Serve 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 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 over UWSGI")
-p.set_defaults(func=handle_serve_uwsgi)
+P = SUB.add_parser('serve-uwsgi', help="Serve over UWSGI")
+P.set_defaults(func=handle_serve_uwsgi)
-args = parser.parse_args()
-if getattr(args, 'func', None) is None:
- parser.print_help()
+ARGS = PARSER.parse_args()
+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)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-backoffice] 02/31: auto{make,conf}, (continued)
- [GNUnet-SVN] [taler-backoffice] 02/31: auto{make,conf}, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 13/31: helper module, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 10/31: moving data, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 23/31: fix names, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 26/31: decrease article cost to make it work with tipping, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 27/31: adjust tests, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 03/31: bootstrap/wsgi/launcher, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 06/31: base template, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 18/31: naming leftovers, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 22/31: pacify PEP checkers, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 21/31: linting the launcher,
gnunet <=
- [GNUnet-SVN] [taler-backoffice] 28/31: survey in side bar, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 14/31: missing templates, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 11/31: actual blog logic, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 05/31: m4, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 09/31: __init__, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 30/31: mock and nose for testing, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 29/31: fix demobar, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 31/31: repo description, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 17/31: right templates dir, gnunet, 2018/01/04
- [GNUnet-SVN] [taler-backoffice] 16/31: testcase, gnunet, 2018/01/04