move job submission to dedicated function

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

diff --git a/qcg/service.py b/qcg/service.py
index c69eee0..9e99d43 100644 (file)
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -84,9 +84,6 @@ def update_user_data(user, proxy):
 
 @transaction.atomic
 def update_job(job, proxy):
-    if job.terminated and job.purged:
-        return
-
     ts = time.time()
     QCG.start()
 
@@ -132,6 +129,22 @@ def update_job(job, proxy):
                 elapsed, job.job_id, elapsed_job, job.tasks.count(), elapsed_tasks, elapsed_py)
 
 
+def submit(obj, proxy):
+    ts = time.time()
+    QCG.start()
+    cred = Credential(proxy)
+
+    jts = time.time()
+    result = obj.submit(cred)
+    elapsed_submit = time.time() - jts
+
+    elapsed = time.time() - ts
+    elapsed_py = elapsed - elapsed_submit
+    logger.info('(%.3f) JOB = %s, REMOTE = %.3f, LOCAL = %.3f', elapsed, result.job_id, elapsed_submit, elapsed_py)
+
+    return result
+
+
 def cancel(obj, proxy):
     ts = time.time()
     QCG.start()
@@ -145,7 +158,7 @@ def cancel(obj, proxy):
 
     elapsed = time.time() - ts
     elapsed_py = elapsed - elapsed_cancel
-    logger.info('(%.3f) OBJ = %s (%.3f), TIME = %.3f', elapsed, obj, elapsed_cancel, elapsed_py)
+    logger.info('(%.3f) OBJ = %s, REMOTE = %.3f, LOCAL = %.3f', elapsed, obj, elapsed_cancel, elapsed_py)
 
 
 def clean(obj, proxy):
@@ -161,4 +174,4 @@ def clean(obj, proxy):
 
     elapsed = time.time() - ts
     elapsed_py = elapsed - elapsed_clean
-    logger.info('(%.3f) OBJ = %s (%.3f), TIME = %.3f', elapsed, obj, elapsed_clean, elapsed_py)
+    logger.info('(%.3f) OBJ = %s, REMOTE = %.3f, LOCAL = %.3f', elapsed, obj, elapsed_clean, elapsed_py)