Commit be05e022 authored by Luckeneder Marcel's avatar Luckeneder Marcel

fixed log bug

parent 62ff9eda
......@@ -257,13 +257,6 @@ class WorkflowManager:
newWorkflow = WorkflowWrapper(restart=True)
print("old")
print(wfToRestart.workDir)
print(wfToRestart.jobStoreForPipeline)
print(wfToRestart.outDir)
print(wfToRestart.toilRunnerArgsList)
print(wfToRestart.toilRunnerArgsListRestart)
newWorkflow.workflowID = wfToRestart.workflowID
newWorkflow.yamlStream = wfToRestart.yamlStream
newWorkflow.cwlStream = wfToRestart.cwlStream
......@@ -287,13 +280,6 @@ class WorkflowManager:
newWorkflow.toilRunnerArgsList = wfToRestart.toilRunnerArgsList
newWorkflow.toilRunnerArgsListRestart = wfToRestart.toilRunnerArgsListRestart
print("new")
print(newWorkflow.workDir)
print(newWorkflow.jobStoreForPipeline)
print(newWorkflow.outDir)
print(newWorkflow.toilRunnerArgsList)
print(newWorkflow.toilRunnerArgsListRestart)
self.workflowList.remove(wfToRestart)
self.workflowList.append(newWorkflow)
newWorkflow.start()
......@@ -330,7 +316,7 @@ class WorkflowManager:
result = i
break
if result is not None:
return result.killToilRunner()
return {"workflow_id":result.workflowID}
else:
return "This Workflow does not exist"
......@@ -500,7 +486,6 @@ class WorkflowWrapper(threading.Thread):
self.stopped = True
self.toilProcess.terminate()
wesDAO.update_Workflow(self.workflowDBID, state="CANCELED")
return {"workflow_id":self.workflowID}
def callToilRunner(self):
"""
......@@ -513,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)
else:
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