From 49c138968d0719b9d6ca53326f9ad7f056107575 Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Mon, 22 May 2023 19:10:14 -0500 Subject: [PATCH] render_queue refactoring --- lib/render_queue.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/render_queue.py b/lib/render_queue.py index 9be2757..d0bedc5 100755 --- a/lib/render_queue.py +++ b/lib/render_queue.py @@ -25,7 +25,7 @@ class JobNotFoundError(Exception): class RenderQueue: job_queue = [] render_clients = [] - maximum_renderer_instances = {'Blender': 2, 'After Effects': 1, 'ffmpeg': 4} + maximum_renderer_instances = {'blender': 2, 'aerender': 1, 'ffmpeg': 4} host_name = None port = 8080 client_mode = False @@ -153,7 +153,7 @@ class RenderQueue: not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True) if not_started: for job in not_started: - renderer = job.worker.renderer + renderer = job.worker.engine.name higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority] max_renderers = renderer in instances.keys() and instances[ renderer] >= cls.maximum_renderer_instances.get(renderer, 1) @@ -191,7 +191,7 @@ class RenderQueue: @classmethod def renderer_instances(cls): from collections import Counter - all_instances = [x.worker.renderer for x in cls.running_jobs()] + all_instances = [x.worker.engine.name for x in cls.running_jobs()] return Counter(all_instances) @classmethod