Aggregate commit.

Fix the way alternative config files are read from
command line, and add a big "switch" where error codes
from HTTP services are read and rendered as nice-ish
messages.

1 files changed, 2 insertions, 1 deletions

diff --git a/taler-merchant-backoffice.in b/taler-merchant-backoffice.in
index 0ea5097..eed11f3 100644
--- a/taler-merchant-backoffice.in
+++ b/taler-merchant-backoffice.in
@@ -19,12 +19,12 @@ site.addsitedir("%s/lib/python%d.%d/site-packages" % (
     sys.version_info.minor))
 
 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)"
 
 def handle_serve_http(args):
+    TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
     port = args.port
     if port is None:
         port = TC["backoffice-%s" % args.frontend]["http_port"].value_int(required=True)
@@ -39,6 +39,7 @@ def handle_serve_http(args):
               "--env", "BACKOFFICE_INSTANCES=%s" % TC["backoffice-%s" % args.frontend]["instances"].value_string(required=True))
               
 def handle_serve_uwsgi(args):
+    TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE"))
     serve_uwsgi = TC["backoffice-%s" % args.frontend]["uwsgi_serve"].value_string(required=True).lower()
     params = ["uwsgi", "uwsgi",
               "--master",