summaryrefslogtreecommitdiff
path: root/talermerchantdemos/donations/donations.py
diff options
context:
space:
mode:
authorMS <ms@taler.net>2022-10-25 15:45:47 +0200
committerMS <ms@taler.net>2022-10-25 15:45:47 +0200
commit01c05e45267f0faeecc3f1d315d9b88b95437372 (patch)
treec408ccb4748e2b9d3bdf0987d04b7f15535e811b /talermerchantdemos/donations/donations.py
parentd82e8d5a1dc363373268fa0a0342f98c2812fd13 (diff)
downloadtaler-merchant-demos-01c05e45267f0faeecc3f1d315d9b88b95437372.tar.gz
taler-merchant-demos-01c05e45267f0faeecc3f1d315d9b88b95437372.tar.bz2
taler-merchant-demos-01c05e45267f0faeecc3f1d315d9b88b95437372.zip
fix -c option
Python modules used to ignore it by completely reloading the config from a default location. CLI now passes values to them.
Diffstat (limited to 'talermerchantdemos/donations/donations.py')
-rw-r--r--talermerchantdemos/donations/donations.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py
index 4ba5daa..9d6e453 100644
--- a/talermerchantdemos/donations/donations.py
+++ b/talermerchantdemos/donations/donations.py
@@ -20,6 +20,7 @@
import base64
import logging
import flask
+import uwsgi
from flask import request, url_for
from flask_babel import Babel
from flask_babel import refresh
@@ -44,6 +45,7 @@ if not sys.version_info.major == 3 and sys.version_info.minor >= 6:
)
sys.exit(1)
+logging.basicConfig()
LOGGER = logging.getLogger(__name__)
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -53,11 +55,10 @@ app.wsgi_app = ProxyFix(app.wsgi_app, x_host=1, x_prefix=1)
app.debug = True
app.secret_key = base64.b64encode(os.urandom(64)).decode("utf-8")
-TC = TalerConfig.from_env()
try:
- BACKEND_BASE_URL = TC["frontends"]["backend"].value_string(required=True)
- CURRENCY = TC["taler"]["currency"].value_string(required=True)
- APIKEY = TC["frontends"]["backend_apikey"].value_string(required=True)
+ BACKEND_BASE_URL = uwsgi.opt["backend_url"].decode("utf-8")
+ CURRENCY = uwsgi.opt["currency"].decode("utf-8")
+ APIKEY = uwsgi.opt["apikey"].decode("utf-8")
except ConfigurationError as ce:
print(ce)
exit(1)
@@ -70,6 +71,8 @@ babel.localeselector(get_locale)
LOGGER.info("Using translations from:" + ":".join(list(babel.translation_directories)))
+LOGGER.info("backend: " + BACKEND_BASE_URL)
+LOGGER.info("currency: " + CURRENCY)
translations = [str(translation) for translation in babel.list_translations()]
if not "en" in translations:
translations.append("en")