From 9e9dfdfd55b2b8d2377f8ef4e288a1fa482105b9 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Sat, 19 Mar 2016 13:08:31 +0000 Subject: [PATCH] Fix workflow scheduler log message. --- lib/galaxy/workflow/run.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/workflow/run.py b/lib/galaxy/workflow/run.py index 6bad18648bc..7d45e2892e2 100644 --- a/lib/galaxy/workflow/run.py +++ b/lib/galaxy/workflow/run.py @@ -153,6 +153,7 @@ class WorkflowInvoker( object ): remaining_steps = self.progress.remaining_steps() delayed_steps = False for step in remaining_steps: + step_delayed = False step_timer = ExecutionTimer() jobs = None try: @@ -167,7 +168,7 @@ class WorkflowInvoker( object ): workflow_invocation_step.workflow_step = step workflow_invocation_step.job = job except modules.DelayedWorkflowEvaluation: - delayed_steps = True + step_delayed = delayed_steps = True self.progress.mark_step_outputs_delayed( step ) except Exception: log.exception( @@ -177,7 +178,8 @@ class WorkflowInvoker( object ): ) raise - log.debug("Workflow step %s of invocation %s invoked %s" % (step.id, workflow_invocation.id, step_timer)) + step_verb = "invoked" if not step_delayed else "delayed" + log.debug("Workflow step %s of invocation %s %s %s" % (step.id, workflow_invocation.id, step_verb, step_timer)) if delayed_steps: state = model.WorkflowInvocation.states.READY