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

Improve job management. Remove archived flag.

Browse Source
This commit is contained in:
Brett Williams
2022-10-30 14:21:06 -07:00
parent 5785989af4
commit a71e3fe119
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/job_server.py
View File

@@ -22,7 +22,7 @@ server = Flask(__name__)
@server.get('/jobs')
def jobs_json():
return [x.json_safe_copy() for x in RenderQueue.job_queue if not x.archived]
return [x.json_safe_copy() for x in RenderQueue.job_queue]
@server.get('/jobs/<status_val>')
@@ -130,7 +130,7 @@ def full_status():
@server.get('/snapshot')
def snapshot():
server_status = RenderQueue.status()
server_jobs = [x.json_safe_copy() for x in RenderQueue.job_queue if not x.archived]
server_jobs = [x.json_safe_copy() for x in RenderQueue.job_queue]
server_data = {'status': server_status, 'jobs': server_jobs, 'timestamp': datetime.now().isoformat()}
return server_data
@@ -270,7 +270,6 @@ def cancel_job():
else:
found = [x for x in RenderQueue.job_queue if x.id == job_id]
if len(found) > 1:
# logger.error('Multiple jobs found for ID {}'.format(job_id))
return f'multiple jobs found for ID {job_id}', 400
elif found:
success = RenderQueue.cancel_job(found[0])