diff options
| -rw-r--r-- | bank.conf | 2 | ||||
| -rw-r--r-- | talerbank/settings_base.py | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,3 @@ [bank] uwsgi_serve = tcp -database = postgres://talerbank +database = postgres:///talerbank diff --git a/talerbank/settings_base.py b/talerbank/settings_base.py index 5eb2b57..df0e588 100644 --- a/talerbank/settings_base.py +++ b/talerbank/settings_base.py @@ -92,13 +92,14 @@ DATABASES = {} # parse a database URL, django can't natively do this! dbname = tc.value_string("bank", "database", required=False) +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)) - dbconfig['ENGINE'] = 'django.db.backends.postgresql_psycopg2' - dbconfig['NAME'] = db_url.path.lstrip("/") + 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) @@ -117,9 +118,10 @@ if dbname: 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'), + "ENGINE": "django.db.backends.sqlite3", + "NAME": os.path.join(BASE_DIR, "db.sqlite3"), } |