brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where max render instance limit was ignored

Browse Source
This commit is contained in:
Brett Williams
2023-05-27 21:42:40 -05:00
parent eaacbf4ec0
commit e300024e2b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/render_queue.py
View File

@@ -47,7 +47,7 @@ class RenderQueue:
session = Session() session = Session()
ScheduledJob.register_user_events() ScheduledJob.register_user_events()
job_queue = [] job_queue = []
maximum_renderer_instances = {'blender': 2, 'aerender': 1, 'ffmpeg': 4} maximum_renderer_instances = {'blender': 1, 'aerender': 1, 'ffmpeg': 4}
hostname = None hostname = None
port = 8080 port = 8080
client_mode = False client_mode = False
@@ -119,12 +119,10 @@ class RenderQueue:
@classmethod @classmethod
def evaluate_queue(cls): def evaluate_queue(cls):
instances = cls.renderer_instances()
not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True) not_started = cls.jobs_with_status(RenderStatus.NOT_STARTED, priority_sorted=True)
if not_started: if not_started:
for job in not_started: for job in not_started:
instances = cls.renderer_instances()
higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority] higher_priority_jobs = [x for x in cls.running_jobs() if x.priority < job.priority]
max_renderers = job.renderer in instances.keys() and instances[ max_renderers = job.renderer in instances.keys() and instances[
job.renderer] >= cls.maximum_renderer_instances.get(job.renderer, 1) job.renderer] >= cls.maximum_renderer_instances.get(job.renderer, 1)