gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-bank] branch master updated: fix handling of no curr


From: gnunet
Subject: [GNUnet-SVN] [taler-bank] branch master updated: fix handling of no currency given in config
Date: Mon, 17 Jul 2017 20:10:48 +0200

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 64c671b  fix handling of no currency given in config
64c671b is described below

commit 64c671b20ff9a46dd29ce8b198fca3449a860958
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Jul 17 20:10:29 2017 +0200

    fix handling of no currency given in config
---
 Makefile.am           |  2 +-
 talerbank/settings.py | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 05fa394..63b9a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ check:
        @printf -- 
"\n\n----------------------------------------------------------------------\nTesting
 against bad amount\n\n"
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" 
TALER_PREFIX="@prefix@" TALER_CONFIG_FILE="bank-check-alt-badamount.conf" && 
python3 -m django test talerbank.app.tests_alt.BadMaxDebtOptionTestCase
        @printf -- 
"\n\n----------------------------------------------------------------------\nTesting
 against no currency in config\n\n"
-       @export DJANGO_SETTINGS_MODULE="talerbank.settings" 
TALER_PREFIX="@prefix@" TALER_CONFIG_FILE="bank-check-alt-nocurrency.conf" && 
python3 -m django test talerbank.app.tests_alt.NoCurrencyOptionTestCase
+       @export DJANGO_SETTINGS_MODULE="talerbank.settings" 
TALER_PREFIX="@prefix@" TALER_CONFIG_FILE="bank-check-alt-nocurrency.conf" && 
python3 -m django test talerbank.app.tests_alt.NoCurrencyOptionTestCase ; test 
3 = $$?
 
 # install into prefix
 install-exec-hook:
diff --git a/talerbank/settings.py b/talerbank/settings.py
index 9840020..9449482 100644
--- a/talerbank/settings.py
+++ b/talerbank/settings.py
@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
 import os
 import logging
 import base64
-from .talerconfig import TalerConfig
+from .talerconfig import TalerConfig, ConfigurationError
 import sys
 import urllib.parse
 import re
@@ -180,17 +180,16 @@ STATIC_ROOT = '/tmp/talerbankstatic/'
 
 ROOT_URLCONF = "talerbank.app.urls"
 
-TALER_CURRENCY = tc.value_string("taler", "currency", required=True)
+try:
+    TALER_CURRENCY = tc.value_string("taler", "currency", required=True)
+except ConfigurationError as e:
+    logger.error(e)
+    sys.exit(3)
 
-TALER_MAX_DEBT = tc.value_string("bank", "MAX_DEBT",
-                                 default="%s:50" % TALER_CURRENCY)
-
-TALER_MAX_DEBT_BANK = tc.value_string("bank", "MAX_DEBT_BANK",
-                                      default="%s:0" % TALER_CURRENCY)
+TALER_MAX_DEBT = tc.value_string("bank", "MAX_DEBT", default="%s:50" % 
TALER_CURRENCY)
+TALER_MAX_DEBT_BANK = tc.value_string("bank", "MAX_DEBT_BANK", default="%s:0" 
% TALER_CURRENCY)
 
 TALER_DIGITS = 2
 TALER_PREDEFINED_ACCOUNTS = ['Tor', 'GNUnet', 'Taler', 'FSF', 'Tutorial']
 TALER_EXPECTS_DONATIONS = ['Tor', 'GNUnet', 'Taler', 'FSF']
 TALER_SUGGESTED_EXCHANGE = tc.value_string("bank", "suggested_exchange")
-
-logging.info("currency: '%s'", TALER_CURRENCY)

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]