From e9c9cd30532312a5f814200798568b369b19ef5d Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.de>
Date: Tue, 12 Feb 2019 18:36:27 +0100
Subject: [PATCH] Remove const module.

---
 app.py    | 4 +---
 conf.sh   | 8 +++++---
 config.py | 2 ++
 const.py  | 9 ---------
 db.py     | 6 +++---
 5 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 const.py

diff --git a/app.py b/app.py
index 904e84b..0a9d0cb 100644
--- a/app.py
+++ b/app.py
@@ -8,14 +8,12 @@ from flask_bootstrap import Bootstrap
 import db
 import forms
 import models
-import const
 from config import Config
 
 
-logging.basicConfig(filename=const.LOG_PATH, level=logging.DEBUG)
+logging.basicConfig(filename=Config.LOG_PATH, level=logging.DEBUG)
 
 logging.info(f"Starting in working dir: {os.getcwd()}")
-logging.info(f"App base path: {const.BASE_PATH}")
 
 
 def create_app():
diff --git a/conf.sh b/conf.sh
index 2443548..0d9b97d 100644
--- a/conf.sh
+++ b/conf.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
-export READ_PW=""
-export WRITE_PW=""
-export SECRET_KEY=""
\ No newline at end of file
+export ES_READ_PW=""
+export ES_WRITE_PW=""
+export ES_SECRET_KEY=""
+export ES_DATABASE_PATH=""
+export ES_LOG_PATH=""
\ No newline at end of file
diff --git a/config.py b/config.py
index 3422e50..79513d9 100644
--- a/config.py
+++ b/config.py
@@ -5,3 +5,5 @@ class Config:
     SECRET_KEY = os.environ.get("ES_SECRET_KEY")
     WRITE_PW = os.environ.get("ES_WRITE_PW")
     READ_PW = os.environ.get("ES_READ_PW")
+    DATABASE_PATH = os.environ.get("ES_DATABASE_PATH")
+    LOG_PATH = os.environ.get("ES_LOG_PATH")
diff --git a/const.py b/const.py
deleted file mode 100644
index 415f5f9..0000000
--- a/const.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import os
-
-BASE_PATH = os.path.dirname(os.path.realpath(__file__))
-
-DATABASE_NAME = "es_debug.db"
-DATABASE_PATH = os.path.join(BASE_PATH, DATABASE_NAME)
-
-LOG_NAME = "estus-shots.log"
-LOG_PATH = os.path.join(BASE_PATH, LOG_NAME)
diff --git a/db.py b/db.py
index 5b8f450..7c47d33 100644
--- a/db.py
+++ b/db.py
@@ -3,15 +3,15 @@ import logging as log
 from flask import g
 
 import models
-import const
+from config import Config
 
 
 def connect_db():
     """Create a new sqlite3 connection and register it in 'g._database'"""
     db = getattr(g, "_database", None)
     if db is None:
-        log.info(f"Connecting {const.DATABASE_NAME}")
-        db = g._database = sqlite3.connect(const.DATABASE_PATH)
+        log.info(f"Connecting {Config.DATABASE_PATH}")
+        db = g._database = sqlite3.connect(Config.DATABASE_PATH)
 
     db.row_factory = sqlite3.Row
     return db