diff options
author | MS <ms@taler.net> | 2020-10-09 13:57:23 +0200 |
---|---|---|
committer | MS <ms@taler.net> | 2020-10-09 13:57:23 +0200 |
commit | a3f0d4936a2778aaa139855f11b2f5a42c628023 (patch) | |
tree | 459d2e93628085d925e37b2beecddd7448d45f95 /bin | |
parent | f9915ab8a3006a6633aad4101a1a798382afa39b (diff) | |
download | taler-merchant-demos-a3f0d4936a2778aaa139855f11b2f5a42c628023.tar.gz taler-merchant-demos-a3f0d4936a2778aaa139855f11b2f5a42c628023.tar.bz2 taler-merchant-demos-a3f0d4936a2778aaa139855f11b2f5a42c628023.zip |
fix configuration parsing
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/taler-merchant-demos | 9 |
1 files changed, 4 insertions, 5 deletions
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() |