Skip to content

Commit

Permalink
fixes...
Browse files Browse the repository at this point in the history
  • Loading branch information
hjoliver committed Aug 16, 2017
1 parent 90966db commit 4d71f6b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 0 additions & 2 deletions lib/cylc/task_events_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,6 @@ def process_message(self, itask, priority, message, poll_event_time=None,
if priority in [TaskMessage.WARNING, TaskMessage.CRITICAL]:
self.setup_event_handlers(itask, priority.lower(), message)

return

def setup_event_handlers(self, itask, event, message):
"""Set up handlers for a task event."""
if itask.tdef.run_mode != 'live':
Expand Down
5 changes: 3 additions & 2 deletions lib/cylc/task_job_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,8 @@ def _manip_task_jobs_callback(
"""Callback when submit/poll/kill tasks command exits."""
if ctx.ret_code:
LOG.error(ctx)
else:
LOG.debug(ctx)
tasks = {}
# Note for "kill": It is possible for a job to trigger its trap and
# report back to the suite back this logic is called. If so, the task
Expand Down Expand Up @@ -728,8 +730,7 @@ def _run_job_cmd(self, cmd_key, suite, itasks, callback):
itask.point, itask.tdef.name, itask.submit_num))
cmd += job_log_dirs
self.proc_pool.put_command(
SuiteProcContext(
cmd_key, cmd), callback, [suite, itasks])
SuiteProcContext(cmd_key, cmd), callback, [suite, itasks])

@staticmethod
def _set_retry_timers(itask, rtconfig=None):
Expand Down
2 changes: 1 addition & 1 deletion lib/cylc/task_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
TASK_STATUS_RUNAHEAD,
TASK_STATUS_WAITING,
TASK_STATUS_HELD,
TASK_STATUS_EXPIRED,
TASK_STATUS_QUEUED,
TASK_STATUS_READY,
TASK_STATUS_EXPIRED,
TASK_STATUS_SUBMITTED,
TASK_STATUS_SUBMIT_FAILED,
TASK_STATUS_SUBMIT_RETRYING,
Expand Down

0 comments on commit 4d71f6b

Please sign in to comment.