[GNUnet-SVN] [taler-bank] branch master updated: get rid of multichoice regarding db backend: only postgres for now.

[gnunet]

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 d62b569  get rid of multichoice regarding db backend: only postgres 
for now.
d62b569 is described below

commit d62b569c06ad45107411e469ef4ba75a10df5405
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed May 3 14:35:01 2017 +0200

    get rid of multichoice regarding db backend: only
    postgres for now.
---
 talerbank/settings_base.py | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/talerbank/settings_base.py b/talerbank/settings_base.py
index df0e588..7cb2210 100644
--- a/talerbank/settings_base.py
+++ b/talerbank/settings_base.py
@@ -91,39 +91,34 @@ WSGI_APPLICATION = 'talerbank.wsgi.application'
 DATABASES = {}
 
 # parse a database URL, django can't natively do this!
-dbname = tc.value_string("bank", "database", required=False)
+dbname = tc.value_string("bank", "database", required=True)
 logger.info("dbname: %s" % dbname)
 dbconfig = {}
-if dbname:
-    db_url = urllib.parse.urlparse(dbname)
-    if db_url.scheme != "postgres":
-        raise Exception("only postgres db is supported ('{}' not 
understood)".format(dbname))
+db_url = urllib.parse.urlparse(dbname)
+
+if db_url.scheme not in ("postgres"):
+    raise Exception("Only 'postgres' DB is supported")
+
+if db_url.scheme == "postgres":
     dbconfig["ENGINE"] = 'django.db.backends.postgresql_psycopg2'
     dbconfig["NAME"] = db_url.path.lstrip("/")
 
-    if not db_url.netloc:
-        p = urllib.parse.parse_qs(db_url.query)
-        if ("host" not in p) or len(p["host"]) == 0:
-            host = None
-        else:
-            host = p["host"][0]
+if not db_url.netloc:
+    p = urllib.parse.parse_qs(db_url.query)
+    if ("host" not in p) or len(p["host"]) == 0:
+        host = None
     else:
-        host = db_url.netloc
-
-    if host:
-        dbconfig["HOST"] = host
+        host = p["host"][0]
+else:
+    host = db_url.netloc
 
-    logger.info("db string '%s'", dbname)
-    logger.info("db info '%s'", dbconfig)
+if host:
+    dbconfig["HOST"] = host
 
-    DATABASES["default"] = dbconfig
-else:
-    logger.info("sqlite branch: %s" % os.path.join(BASE_DIR, "db.sqlite3"))
-    DATABASES["default"] = {
-            "ENGINE": "django.db.backends.sqlite3",
-            "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
-    }
+logger.info("db string '%s'", dbname)
+logger.info("db info '%s'", dbconfig)
 
+DATABASES["default"] = dbconfig
 
 # Password validation
 # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators

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