From a3f0d4936a2778aaa139855f11b2f5a42c628023 Mon Sep 17 00:00:00 2001 From: MS Date: Fri, 9 Oct 2020 13:57:23 +0200 Subject: fix configuration parsing --- bin/taler-merchant-demos | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bin/taler-merchant-demos') diff --git a/bin/taler-merchant-demos b/bin/taler-merchant-demos index 58c72d0..f2318bf 100755 --- a/bin/taler-merchant-demos +++ b/bin/taler-merchant-demos @@ -91,7 +91,7 @@ def handle_serve_http(config, whichShop, port=None): sys.exit(1) def handle_serve_from_config(config_obj, which_shop): - if config_obj.value_string("blog", "serve", required=False) == "http": + if config_obj.value_string("blog", "serve", required=True).lower() == "http": http_port = config_obj.value_int(which_shop, "port") return handle_serve_http(config_obj, which_shop, http_port) handle_serve_uwsgi(config_obj, which_shop) @@ -108,8 +108,7 @@ def demos(config, http_port, which_shop): os.environ["TALER_CONFIG_FILE"] = config config_obj = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) if http_port: - handle_serve_http(config_obj, which_shop, http_port) - else: - handle_serve_from_config(config_obj, which_shop) - handle_serve_uwsgi(config_obj, which_shop) + return handle_serve_http(config_obj, which_shop, http_port) + handle_serve_from_config(config_obj, which_shop) + demos() -- cgit v1.2.3