From 3f63225a1312732fd567b2ea6fb0095608397af5 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Fri, 27 Nov 2020 12:20:40 +0100
Subject: [PATCH] Separated db creation from running engine. #58
---
run.py | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/run.py b/run.py
index eed4cc56..3691fbb3 100755
--- a/run.py
+++ b/run.py
@@ -28,8 +28,6 @@ import signal
import logging
import subprocess
-import time
-
from flask import Flask
from flask_sqlalchemy import SQLAlchemy
@@ -77,14 +75,9 @@ class EngineRunner:
def run(self, start_lqs, lqs_debug_flags):
"""
Starts Engine Core.
- """
- from src.scheduling.models import AuraDatabaseModel
+ """
from src.core.engine import Engine
- # Check if the database has to be re-) created
- if self.config.get("recreate_db") is not None:
- AuraDatabaseModel.recreate_db()
-
if start_lqs:
runner.run_lqs(lqs_debug_flags)
else:
@@ -136,6 +129,15 @@ class EngineRunner:
+ def recreate_db(self):
+ """
+ Initializes the database and deletes any existing content.
+ """
+ from src.scheduling.models import AuraDatabaseModel
+ AuraDatabaseModel.recreate_db()
+
+
+
def exit_gracefully(self, signum, frame):
"""
Shutdown of the engine. Also terminates the Liquidsoap thread.
@@ -173,7 +175,8 @@ if __name__ == "__main__":
if "--use-test-data" in sys.argv:
runner.config.set("use_test_data", True)
if "--recreate-database" in sys.argv:
- runner.config.set("recreate_db", True)
+ runner.recreate_db()
+ sys.exit(0)
if lqs_cmd:
print(runner.get_lqs_cmd(True, True))
--
GitLab