From 5a4763366be2d33ae465c9b3d96ea8877c99e64d Mon Sep 17 00:00:00 2001 From: b3yond Date: Tue, 6 Nov 2018 18:08:51 +0100 Subject: [PATCH] if an env var is an empty string, use values from example config --- config.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index d47bb8e..bc7baaf 100755 --- a/config.py +++ b/config.py @@ -13,37 +13,44 @@ def load_env(): configdict = toml.load(defaultconf) try: - configdict['twitter']['consumer_key'] = os.environ['CONSUMER_KEY'] + if os.environ['CONSUMER_KEY'] != "": + configdict['twitter']['consumer_key'] = os.environ['CONSUMER_KEY'] except KeyError: pass try: - configdict['twitter']['consumer_secret'] = os.environ['CONSUMER_SECRET'] + if os.environ['CONSUMER_SECRET'] != "": + configdict['twitter']['consumer_secret'] = os.environ['CONSUMER_SECRET'] except KeyError: pass try: - configdict['web']['host'] = os.environ['HOST'] + if os.environ['HOST'] != "": + configdict['web']['host'] = os.environ['HOST'] except KeyError: pass try: - configdict['web']['port'] = os.environ['PORT'] + if os.environ['PORT'] != "": + configdict['web']['port'] = os.environ['PORT'] except KeyError: pass try: - configdict['web']['contact'] = os.environ['CONTACT'] + if os.environ['CONTACT'] != "": + configdict['web']['contact'] = os.environ['CONTACT'] except KeyError: pass try: - configdict['mail']['mbox_user'] = os.environ['MBOX_USER'] + if os.environ['MBOX_USER'] != "": + configdict['mail']['mbox_user'] = os.environ['MBOX_USER'] except KeyError: pass try: - configdict['database']['db_path'] = os.environ['DB_PATH'] + if os.environ['DB_PATH'] != "": + configdict['database']['db_path'] = os.environ['DB_PATH'] except KeyError: pass