Commit 3646fa01 authored by Keller Patrick's avatar Keller Patrick

Merge branch 'dev' of ssh:// into dev

parents f4e74ee3 be05e022
......@@ -316,7 +316,7 @@ class WorkflowManager:
result = i
if result is not None:
return result.killToilRunner()
return {"workflow_id":result.workflowID}
return "This Workflow does not exist"
......@@ -486,7 +486,6 @@ class WorkflowWrapper(threading.Thread):
self.stopped = True
wesDAO.update_Workflow(self.workflowDBID, state="CANCELED")
return {"workflow_id":self.workflowID}
def callToilRunner(self):
......@@ -499,6 +498,8 @@ class WorkflowWrapper(threading.Thread):
if not self.restart:
self.toilProcess = subprocess.Popen(self.toilRunnerArgsList, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False)
self.stopped = False
self.restart = False
self.toilProcess = None
self.toilProcess = subprocess.Popen(self.toilRunnerArgsListRestart, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment