diff --git a/src/server/BreCal/__init__.py b/src/server/BreCal/__init__.py index e15818a..3afbb8d 100644 --- a/src/server/BreCal/__init__.py +++ b/src/server/BreCal/__init__.py @@ -13,8 +13,6 @@ from .api import ships from .api import login from .api import user -sessions = dict() - def create_app(test_config=None): app = Flask(__name__, instance_relative_config=True) @@ -44,7 +42,7 @@ def create_app(test_config=None): logging.basicConfig(filename='brecal.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s') - local_db.initPool() + local_db.initPool(app.instance_path) logging.info('App started') return app diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py index edecd3b..018b793 100644 --- a/src/server/BreCal/local_db.py +++ b/src/server/BreCal/local_db.py @@ -4,13 +4,14 @@ import logging import json import os -connection_pool = None +config_path = None -def initPool(): +def initPool(instancePath): try: + if(config_path == None): + config_path = os.path.join(instancePath,'../../../../secure/connection_data_test.json'); - config_path = '../../../../secure/connection_data_test.json' - print (os.getcwd()) + print (instancePath) if not os.path.exists(config_path): print ('cannot find ' + config_path) exit(1) @@ -31,7 +32,6 @@ def initPool(): print(e) def getPoolConnection(): - config_path = '../../../../secure/connection_data_test.json' f = open(config_path); connection_data = json.load(f) return mysql.connector.connect(**connection_data) \ No newline at end of file diff --git a/src/server/flaskapp.wsgi b/src/server/flaskapp.wsgi index 1dc7818..bb43a71 100644 --- a/src/server/flaskapp.wsgi +++ b/src/server/flaskapp.wsgi @@ -1,8 +1,8 @@ import sys import logging -sys.path.insert(0, '/var/www/brecal/server') -sys.path.insert(0, '/var/www/brecal/venv/lib/python3.10/site-packages/') +sys.path.insert(0, '/var/www/brecal_test/server') +sys.path.insert(0, '/var/www/venv/lib/python3.10/site-packages/') # Set up logging logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)