From 900b47184ce8125daf47b61a20e079f966274bdc Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Wed, 18 Jul 2018 22:29:38 +0200
Subject: [PATCH] cleaned up schedule functions
---
jobmanagement.py | 8 ++++----
jobtypes.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jobmanagement.py b/jobmanagement.py
index 00c3587..0136bda 100644
--- a/jobmanagement.py
+++ b/jobmanagement.py
@@ -51,11 +51,11 @@ def schedule_job(jobtype, data=None, priority=0, queue="default"):
return modify('INSERT INTO jobs (type, priority, queue, data, time_created) VALUES (?, ?, ?, ?, ?)',
jobtype, priority, queue, json.dumps(data, default=date_json_handler), datetime.now())
def cancel_job(job_id):
- modify('UPDATE jobs SET state = "deleted" WHERE id = ? AND state = "ready"', job_id)
- modify('UPDATE jobs SET canceled = 1 WHERE id = ?', job_id)
+ query('UPDATE jobs SET state = "deleted" WHERE id = ? AND state = "ready"', job_id)
+ query('UPDATE jobs SET canceled = 1 WHERE id = ?', job_id)
def restart_job(job_id, canceled=False):
if canceled:
- modify('UPDATE jobs SET state = "ready", canceled = 0 WHERE id = ? AND state = "failed"', job_id)
+ query('UPDATE jobs SET state = "ready", canceled = 0 WHERE id = ? AND state = "failed"', job_id)
else:
- modify('UPDATE jobs SET state = "ready" WHERE id = ? AND state = "failed" AND NOT canceled', job_id)
+ query('UPDATE jobs SET state = "ready" WHERE id = ? AND state = "failed" AND NOT canceled', job_id)
diff --git a/jobtypes.py b/jobtypes.py
index e897608..8d11213 100644
--- a/jobtypes.py
+++ b/jobtypes.py
@@ -19,7 +19,7 @@ def schedule_thumbnail(lectureid):
JOIN formats ON (videos.video_format = formats.id)
WHERE videos.lecture_id = ?
ORDER BY formats.prio DESC''', lectureid)
- schedule_job('thumbnail', {'lectureid': str(lectureid), 'path': videos[0]['path']})
+ return schedule_job('thumbnail', {'lectureid': str(lectureid), 'path': videos[0]['path']})
def schedule_remux(lectureid, videoid=None):
@@ -73,5 +73,5 @@ def schedule_transcode(source, fmt_id=None, video=None):
data['lecture_id'] = lecture['id']
data['format_id'] = fmt['id']
data['source_id'] = source['id']
- schedule_job('transcode', data, queue="background")
+ return schedule_job('transcode', data, queue="background")
--
GitLab