taler-merchant-demos

Python-based Frontends for the Demonstration Web site
Log | Files | Refs | Submodules | README | LICENSE

commit 0a05baf6e9cc38c66ae461f5de6fbdc1afefc884
parent 873058822ed8decb96583e84dab55796714d3334
Author: Florian Dold <florian@dold.me>
Date:   Wed, 12 Feb 2025 00:31:38 +0100

do not use uwsgi

Diffstat:
Mtalermerchantdemos/provision/provision.py | 13+++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/talermerchantdemos/provision/provision.py b/talermerchantdemos/provision/provision.py @@ -19,7 +19,6 @@ import base64 import logging import flask -import uwsgi from flask import request, url_for from flask_babel import Babel from flask_babel import refresh @@ -38,6 +37,7 @@ import urllib from ..util.talerconfig import TalerConfig, ConfigurationError from urllib.parse import urljoin from ..httpcommon import backend_post, backend_get, make_utility_processor, get_locale +from ..appconfig import load_taler_config import sys if not sys.version_info.major == 3 and sys.version_info.minor >= 6: @@ -64,19 +64,16 @@ BABEL_TRANSLATION_DIRECTORIES = "../translations" babel = Babel(app) babel.localeselector(get_locale) -config_filename = uwsgi.opt["config_filename"].decode("utf-8") -if config_filename == "": - config_filename = None -config = TalerConfig.from_file(config_filename) +config = load_taler_config() CURRENCY = config["taler"]["currency"].value_string(required=True) backend_urls = {} backend_apikeys = {} -timeouts={} +timeouts = {} -timeouts["init"]= config["frontend-demo-provision"][f"timeout_init"].value_string(required=True) -timeouts["idle"]= config["frontend-demo-provision"][f"timeout_idle"].value_string(required=True) +timeouts["init"] = config["frontend-demo-provision"][f"timeout_init"].value_string(required=True) +timeouts["idle"] = config["frontend-demo-provision"][f"timeout_idle"].value_string(required=True) def add_backend(name): backend_urls[name] = config["frontend-demo-provision"][f"backend_url_{name}"].value_string(required=True)