1 files changed, 18 insertions, 5 deletions
diff --git a/src/map_node5_net.py b/src/map_node5_net.py
index fa8a425..be5f6f1 100644
--- a/src/map_node5_net.py
+++ b/src/map_node5_net.py
@@ -1,5 +1,6 @@
 import json
 import os
+import pathlib
 
 import flask
 
@@ -30,7 +31,6 @@ class ColorFormatter(logging.Formatter):
         formatter = logging.Formatter(log_fmt)
         return formatter.format(record)
 
-
 logger = logging.getLogger(__name__)  # Instantiate a logger to be used in this module
 
 # Display every message Change this to INFO to see INFO and above (filter out DEBUG)
@@ -41,8 +41,15 @@ stream_handler = logging.StreamHandler()  # This catches and handles log message
 stream_handler.setFormatter(ColorFormatter())
 logger.root.addHandler(stream_handler)
 
+
+db_conninfo = os.environ["DB_CONN"]
+logger.debug(f'DB_CONN: {db_conninfo}')
+db = db_handler.DBHandler(conninfo=db_conninfo)
+
+
 app = flask.Flask(__name__, template_folder='templates', static_folder='static', static_url_path='')
 
+
 @app.route("/")
 def index():
     return flask.render_template('/index.html')
@@ -50,11 +57,11 @@ def index():
 
 @app.route("/chains.json")
 def chains():
-    files = os.listdir(os.path.join(os.getcwd(), 'src', 'static', 'icons'))
+    files = os.listdir(os.path.join(pathlib.Path(__file__).parent, 'static', 'icons'))
     files.pop(files.index('Unknown.png'))
     icon_names = set([os.path.splitext(a)[0] for a in files])
 
-    chains = db_handler.get_chains()
+    chains = db.get_chains()
     chain_names = set((a['name'] for a in chains))
     if icon_names != chain_names:
         print(f'WARNING ICON MISSING, OR DB ENTRY MISSING')
@@ -64,7 +71,7 @@ def chains():
 
 @app.route("/categories.json")
 def categories():
-    categories = db_handler.categories
+    categories = db.categories
     return json.dumps(categories)
 
 @app.route("/all.json")
@@ -72,7 +79,7 @@ def all():
     category_RADIOACTIVE = flask.request.args.get('category')  # User input is RADIOACTIVE
     country_RADIOACTIVE = flask.request.args.get('country')  # User input is RADIOACTIVE
     #logger.debug(f'/all.json requested, input params: category: {category_RADIOACTIVE} country: {country_RADIOACTIVE}')
-    rows = db_handler.get_all(country_RADIOACTIVE, category_RADIOACTIVE)
+    rows = db.get_all(country_RADIOACTIVE, category_RADIOACTIVE)
     for row in rows:
         coordinates = []
         for coordinate in json.loads(row['polygon'])['coordinates'][0]:
@@ -80,3 +87,9 @@ def all():
         row['polygon'] = coordinates
     return json.dumps(rows)
 
+def main():
+    global app
+    app.run()
+
+if __name__ == '__main__':
+    main()