re-configured the logic for checkjob_thread timeseries closes #771

sandialabs · Oct 19, 2017 · a53326c · a53326c
1 parent fd7f536
commit a53326c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/web-server/plugins/slycat-timeseries-model/slycat-timeseries-model.py b/web-server/plugins/slycat-timeseries-model/slycat-timeseries-model.py
@@ -228,16 +228,17 @@ def checkjob_thread(mid, sid, jid, request_from, stop_event, callback):
 
                 if retry_counter == 0:
                     fail_model(mid,
-                               "Something went wrong while checking on job %s status: check for the generated files when the job completes." % jid)
+                               "Something went wrong while checking on job %s status: check for the generated files "
+                               "when the job completes." % jid)
                     slycat.email.send_error("slycat-timeseries-model.py checkjob_thread",
                                             "An error occurred while checking on a remote job: %s" % e.message)
-                    raise Exception("An error occurred while checking on a remote job: %s" % e.message)
                     stop_event.set()
-                    break
+                    cherrypy.log.error("[TIMESERIES] An error occurred while checking on a remote job error_message: %s"
+                                       % e.message)
+                    raise Exception("An error occurred while checking on a remote job: %s" % jid)
 
                 response = {"status": {"state": "ERROR"}}
                 time.sleep(60)
-                pass
 
             state = response["status"]["state"]
             cherrypy.log.error("checkjob %s returned with status %s" % (jid, state))