canceling jobs and tasks

[qcg-portal.git] / qcg / service.py

diff --git a/qcg/service.py b/qcg/service.py
index f950aac..c87f40a 100644 (file)
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -85,7 +85,7 @@ def update_user_data(user, proxy):
 
 @transaction.atomic
 def update_job(job, proxy):
-    if job.get_status_display() in [JobStatus.FINISHED, JobStatus.FAILED, JobStatus.CANCELED]:
+    if job.terminated:
         return
 
     ts = time.time()
@@ -164,3 +164,19 @@ def submit_job(params, proxy):
     job = desc.submit()
 
     return job.job_id
+
+
+def cancel(obj, proxy):
+    ts = time.time()
+    QCG.start()
+
+    qcg_obj = obj.qcg_job if isinstance(obj, Job) else obj.qcg_task
+    qcg_obj.credential = Credential(proxy)
+
+    jts = time.time()
+    qcg_obj.cancel()
+    elapsed_cancel = time.time() - jts
+
+    elapsed = time.time() - ts
+    elapsed_py = elapsed - elapsed_cancel
+    logger.info('(%.3f) OBJ = %s (%.3f), TIME = %.3f', elapsed, obj, elapsed_cancel, elapsed_py)