diff --git a/lib/render_queue.py b/lib/render_queue.py index d0bedc5..b90ce87 100755 --- a/lib/render_queue.py +++ b/lib/render_queue.py @@ -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.engine.name + 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.engine.name for x in cls.running_jobs()] + all_instances = [x.worker.engine.name() for x in cls.running_jobs()] return Counter(all_instances) @classmethod diff --git a/lib/render_workers/render_worker.py b/lib/render_workers/render_worker.py index 94ac298..f855ef8 100644 --- a/lib/render_workers/render_worker.py +++ b/lib/render_workers/render_worker.py @@ -36,7 +36,7 @@ class BaseRenderWorker(object): if not ignore_extensions: if not any(ext in input_path for ext in self.engine.supported_extensions): - err_meg = f'Cannot find valid project with supported file extension for {self.engine.name} renderer' + err_meg = f'Cannot find valid project with supported file extension for {self.engine.name()} renderer' logger.error(err_meg) raise ValueError(err_meg) if not self.engine: @@ -116,7 +116,7 @@ class BaseRenderWorker(object): return self.status = RenderStatus.RUNNING - logger.info('Starting {0} {1} Render for {2}'.format(self.renderer, self.version(), self.input_path)) + logger.info(f'Starting {self.engine.name()} {self.engine.version()} Render for {self.input_path}') self.__thread.start() def run(self): diff --git a/lib/server/job_server.py b/lib/server/job_server.py index 44a22b5..79a75ec 100755 --- a/lib/server/job_server.py +++ b/lib/server/job_server.py @@ -427,11 +427,12 @@ def status(): def renderer_info(): renderer_data = {} for r in RenderWorkerFactory.supported_renderers(): - renderer_class = RenderWorkerFactory.class_for_name(r) - renderer_data[r] = {'available': renderer_class.renderer_path() is not None, - 'version': renderer_class.version(), - 'supported_extensions': renderer_class.supported_extensions, - 'supported_export_formats': renderer_class.supported_export_formats} + engine = RenderWorkerFactory.class_for_name(r).engine + renderer_data[r] = {'available': engine.renderer_path() is not None, + 'version': engine.version(), + 'supported_extensions': engine.supported_extensions, + 'supported_export_formats': engine.get_formats(), + 'path': engine.renderer_path()} return renderer_data