From 22aaa82da724b97ecb60f00e287769b5ac61b9bf Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Fri, 27 Oct 2023 02:41:31 -0500 Subject: [PATCH] Simplify database.db logic --- src/api/api_server.py | 2 +- src/render_queue.py | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/api/api_server.py b/src/api/api_server.py index b43d826..396c9d8 100755 --- a/src/api/api_server.py +++ b/src/api/api_server.py @@ -535,7 +535,7 @@ def start_server(background_thread=False): EngineManager.update_all_engines() # Set up the RenderQueue object - RenderQueue.start_queue(database_directory=server.config['UPLOAD_FOLDER']) + RenderQueue.load_state(database_directory=server.config['UPLOAD_FOLDER']) DistributedJobManager.start() thread = threading.Thread(target=eval_loop, kwargs={'delay_sec': config.get('queue_eval_seconds', 1)}, daemon=True) diff --git a/src/render_queue.py b/src/render_queue.py index 7419cf8..6f4654a 100755 --- a/src/render_queue.py +++ b/src/render_queue.py @@ -28,14 +28,6 @@ class RenderQueue: def __init__(self): pass - @classmethod - def start_queue(cls, database_directory): - if not cls.engine: - cls.engine = create_engine(f"sqlite:///{os.path.join(database_directory, 'database.db')}") - Base.metadata.create_all(cls.engine) - cls.session = sessionmaker(bind=cls.engine)() - cls.load_state() - @classmethod def add_to_render_queue(cls, render_job, force_start=False): logger.debug('Adding priority {} job to render queue: {}'.format(render_job.priority, render_job)) @@ -82,7 +74,11 @@ class RenderQueue: cls.save_state() @classmethod - def load_state(cls): + def load_state(cls, database_directory): + if not cls.engine: + cls.engine = create_engine(f"sqlite:///{os.path.join(database_directory, 'database.db')}") + Base.metadata.create_all(cls.engine) + cls.session = sessionmaker(bind=cls.engine)() from src.engines.core.base_worker import BaseRenderWorker cls.job_queue = cls.session.query(BaseRenderWorker).all()