From 9b7d7db99692cc24fc640d08f05721d0ccdfcc14 Mon Sep 17 00:00:00 2001
From: Marcus Lindvall <marcus.lindvall@lindvallskaffe.se>
Date: Mon, 8 Apr 2019 11:02:14 +0200
Subject: [PATCH] In progress: Fix configuration logic

---
 pyjeeves/config.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pyjeeves/config.py b/pyjeeves/config.py
index f0a16a2..d510c78 100644
--- a/pyjeeves/config.py
+++ b/pyjeeves/config.py
@@ -3,7 +3,7 @@ import os
 import yaml
 
 
-defaults = {
+config = {
     'alembic': {
         'script_location': 'migrations',
         'sqlalchemy.url': ''},
@@ -37,16 +37,6 @@ defaults = {
             'version': 1},
     'sync_interval': 60}
 
-
-try:
-    with open("config.yml", 'r') as ymlfile:
-        file_config = yaml.load(ymlfile, Loader=yaml.FullLoader)
-        config = {**defaults, **file_config}  # Syntax introduced in Python 3.5
-except IOError as e:
-    pass
-
-dictConfig(config['logging'])
-
 config['debug'] = os.getenv('ENVIRONEMENT') == 'DEV'
 
 DB_CONTAINER = os.getenv('APPLICATION_DB_CONTAINER', 'db')
@@ -64,7 +54,17 @@ config['databases']['meta'] = {
     'port': os.getenv('META_MYSQL_PORT', 3306),
     'db': os.getenv('META_MYSQL_DB', 'pyjeeves'),
 }
+
 # DB_URI = 'postgresql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s' % POSTGRES
 config['alembic']['sqlalchemy.url'] = (
     'mysql+pymysql://%(user)s:%(pw)s@%(host)s:%(port)s/%(db)s?charset=utf8mb4' %
     config['databases']['meta'])
+
+try:
+    with open("config.yml", 'r') as ymlfile:
+        file_config = yaml.load(ymlfile, Loader=yaml.FullLoader)
+        config = {**config, **file_config}  # Syntax introduced in Python 3.5
+except IOError as e:
+    pass
+
+dictConfig(config['logging'])