phillip/karaoqueue
1
0
Fork 0
mirror of https://github.com/PhoenixTwoFive/karaoqueue.git synced 2025-05-19 11:01:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix DB Connection

Browse Source
This commit is contained in:
Phillip Kühne 2022-07-15 15:54:15 +02:00
parent bc44985fed
commit a22960eae9
Signed by: phillip
GPG Key ID: E4C1C4D2F90902AA
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/launch.json vendored
View File

@ -14,7 +14,8 @@
"env": { "env": {
"FLASK_APP": "backend/app.py", "FLASK_APP": "backend/app.py",
"FLASK_ENV": "development", "FLASK_ENV": "development",
"FLASK_DEBUG": "1" "FLASK_DEBUG": "1",
"DBSTRING": "mysql://ek0ur6p6ky9gdmif:kpmi2bav4mvh4jbx@eporqep6b4b8ql12.chr7pe7iynqr.eu-west-1.rds.amazonaws.com:3306/xdfmpudc3remzgj0"
}, },
"args": [ "args": [
"run", "run",

24
backend/helpers.py
View File

@ -49,17 +49,23 @@ def load_version(app):
app.config['VERSION'] = "" app.config['VERSION'] = ""
def load_dbconfig(app): def load_dbconfig(app):
if os.environ.get("JAWSDB_MARIA_URL"): if os.environ.get("FLASK_ENV") == "development":
app.config['VERSION'] = os.environ.get("JAWSDB_MARIA_URL") app.config['DBCONNSTRING'] = os.environ.get("DBSTRING")
elif os.path.isfile(".dbconn"): else:
with open('.dbconn', 'r') as file: if os.environ.get("DEPLOYMENT_PLATFORM") == "Heroku":
data = file.read().replace('\n', '') if os.environ.get("JAWSDB_MARIA_URL"):
if data: app.config['DBCONNSTRING'] = os.environ.get("JAWSDB_MARIA_URL")
app.config['DBCONNSTRING'] = data
else: else:
app.config['DBCONNSTRING'] = "" app.config['DBCONNSTRING'] = ""
else: elif os.path.isfile(".dbconn"):
app.config['DBCONNSTRING'] = "" with open('.dbconn', 'r') as file:
data = file.read().replace('\n', '')
if data:
app.config['DBCONNSTRING'] = data
else:
app.config['DBCONNSTRING'] = ""
else:
app.config['DBCONNSTRING'] = ""
def setup_config(app): def setup_config(app):
if check_config_exists(): if check_config_exists():