diff options
| author | Florian Dold <florian.dold@gmail.com> | 2016-04-19 22:58:42 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2016-04-19 23:05:10 +0200 |
| commit | 6c9bffdb2dd47cd9652ff3d05077b9d61d635067 (patch) | |
| tree | bbc1eabe79f50a81d9185d693eb5470f60672072 /talerbank/settings.py | |
| parent | 3b4257e34f33e62b32cf43113febd363ca6ed482 (diff) | |
| download | bank-6c9bffdb2dd47cd9652ff3d05077b9d61d635067.tar.gz bank-6c9bffdb2dd47cd9652ff3d05077b9d61d635067.tar.bz2 bank-6c9bffdb2dd47cd9652ff3d05077b9d61d635067.zip | |
config parsing in pure python
Diffstat (limited to 'talerbank/settings.py')
| -rw-r--r-- | talerbank/settings.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/talerbank/settings.py b/talerbank/settings.py index 323d744..e0af0ed 100644 --- a/talerbank/settings.py +++ b/talerbank/settings.py @@ -15,7 +15,8 @@ from .talerconfig import TalerConfig logger = logging.getLogger(__name__) -tc = TalerConfig() + +tc = TalerConfig.from_file(os.environ.get("TALER_CONFIG_FILE")) # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -84,10 +85,7 @@ WSGI_APPLICATION = 'talerbank.wsgi.application' # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases -dbname = tc.get_string("bank", "database") -if not dbname: - logger.warn("database not defined in configuration section 'bank', defaulting to 'talerbank'") - dbname = 'talerbank' +dbname = tc["bank"]["database"].value_string(default='talerbank', warn=True) DATABASES = { 'default': { @@ -143,12 +141,7 @@ STATIC_ROOT = '/tmp/talerbankstatic/' -curr = tc.get_string("bank", "currency") -if not curr: - logger.warn("currency not configured in taler config, falling back to PUDOS") - TALER_CURRENCY = "PUDOS" -else: - TALER_CURRENCY = curr +TALER_CURRENCY = tc["taler"]["currency"].value_string(default="KUDOS", warn=True) TALER_PREDEFINED_ACCOUNTS = ['Tor', 'GNUnet', 'Taler', 'FSF'] TALER_EXPECTS_DONATIONS = ['Tor', 'GNUnet', 'Taler', 'FSF'] |