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

Rename RenderJob to ScheduledJob

Browse Source
This commit is contained in:
Brett Williams
2023-05-22 19:41:38 -05:00
parent fbaefdd575
commit d9ebd0b2d9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/render_queue.py
View File

@@ -7,7 +7,7 @@ from datetime import datetime
import psutil import psutil
import requests import requests
from .render_job import RenderJob from .scheduled_job import ScheduledJob
from .render_workers.render_worker import RenderStatus from .render_workers.render_worker import RenderStatus
logger = logging.getLogger() logger = logging.getLogger()
@@ -95,7 +95,7 @@ class RenderQueue:
for job in saved_state.get('jobs', []): for job in saved_state.get('jobs', []):
try: try:
render_job = RenderJob(renderer=job['renderer'], input_path=job['worker']['input_path'], render_job = ScheduledJob(renderer=job['renderer'], input_path=job['worker']['input_path'],
output_path=job['worker']['output_path'], args=job['worker']['args'], output_path=job['worker']['output_path'], args=job['worker']['args'],
priority=job['priority'], client=job['client']) priority=job['priority'], client=job['client'])

2
lib/render_job.py → lib/scheduled_job.py
View File

@@ -12,7 +12,7 @@ from .render_workers.render_worker import RenderStatus, RenderWorkerFactory
logger = logging.getLogger() logger = logging.getLogger()
class RenderJob: class ScheduledJob:
# Get file hash on bg thread # Get file hash on bg thread
def __get_file_hash(self): def __get_file_hash(self):

4
lib/server/job_server.py
View File

@@ -16,7 +16,7 @@ import yaml
from flask import Flask, request, render_template, send_file, after_this_request, Response, redirect, url_for, abort from flask import Flask, request, render_template, send_file, after_this_request, Response, redirect, url_for, abort
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from lib.render_job import RenderJob from lib.scheduled_job import ScheduledJob
from lib.render_queue import RenderQueue, JobNotFoundError from lib.render_queue import RenderQueue, JobNotFoundError
from lib.render_workers.render_worker import RenderWorkerFactory, string_to_status, RenderStatus from lib.render_workers.render_worker import RenderWorkerFactory, string_to_status, RenderStatus
from lib.utilities.server_helper import post_job_to_server, generate_thumbnail_for_job from lib.utilities.server_helper import post_job_to_server, generate_thumbnail_for_job
@@ -309,7 +309,7 @@ def add_job(job_params, remove_job_dir_on_failure=False):
if client == RenderQueue.host_name: if client == RenderQueue.host_name:
logger.info(f"Creating job locally - {name if name else input_path}") logger.info(f"Creating job locally - {name if name else input_path}")
try: try:
render_job = RenderJob(renderer, input_path, output_path, args, priority, job_owner, client, render_job = ScheduledJob(renderer, input_path, output_path, args, priority, job_owner, client,
notify=False, custom_id=custom_id, name=name) notify=False, custom_id=custom_id, name=name)
RenderQueue.add_to_render_queue(render_job, force_start=force_start) RenderQueue.add_to_render_queue(render_job, force_start=force_start)
return render_job.json() return render_job.json()