diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-05-27 18:42:07 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-05-27 18:42:07 +0200 |
| commit | 7c898b3153c22a03d39bcb9e649c8d130ea1b92e (patch) | |
| tree | 4a129c13ce03f147e057b00a2f4e4b2b7d5bb66e | |
| parent | 44f74f2ce694a95a7f73febea029b9f3a2cf4e82 (diff) | |
| download | survey-7c898b3153c22a03d39bcb9e649c8d130ea1b92e.tar.gz survey-7c898b3153c22a03d39bcb9e649c8d130ea1b92e.tar.bz2 survey-7c898b3153c22a03d39bcb9e649c8d130ea1b92e.zip | |
upgrade/fix config logic
| -rw-r--r-- | taler-merchant-survey.in | 2 | ||||
| -rw-r--r-- | talersurvey/talerconfig.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/taler-merchant-survey.in b/taler-merchant-survey.in index 4bb4eaf..a5d5403 100644 --- a/taler-merchant-survey.in +++ b/taler-merchant-survey.in @@ -36,7 +36,6 @@ site.addsitedir("%s/lib/python%d.%d/site-packages" % ( ## @cond -TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) LOGGER = logging.getLogger(__name__) # No perfect match to our logging format, but good enough ... UWSGI_LOGFMT = "%(ltime) %(proto) %(method) %(uri) %(proto) => %(status)" @@ -115,5 +114,6 @@ if getattr(ARGS, 'func', None) is None: if ARGS.config is not None: os.environ["TALER_CONFIG_FILE"] = ARGS.config +TC = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) ARGS.func(ARGS) diff --git a/talersurvey/talerconfig.py b/talersurvey/talerconfig.py index 69d06a8..4a44c97 100644 --- a/talersurvey/talerconfig.py +++ b/talersurvey/talerconfig.py @@ -344,6 +344,7 @@ class TalerConfig: filename = os.path.join(xdg, "taler.conf") else: filename = os.path.expanduser("~/.config/taler.conf") + print("Loading default config: (%s)" % filename) if load_defaults: cfg.load_defaults() cfg.load_file(os.path.expanduser(filename)) @@ -496,7 +497,8 @@ class TalerConfig: value=value, filename=filename, lineno=lineno) sections[current_section][key] = entry except FileNotFoundError: - LOGGER.error("Configuration file (%s) not found", filename) + # not logging here, as this interests the final user mostly. + print("Configuration file (%s) not found" % filename) sys.exit(3) ## |