From 4d71f6bec96e67f455ab5930677906668bba3c24 Mon Sep 17 00:00:00 2001
From: Hilary James Oliver <hilary.j.oliver@gmail.com>
Date: Wed, 16 Aug 2017 17:01:05 +1200
Subject: [PATCH] fixes...

---
 lib/cylc/task_events_mgr.py | 2 --
 lib/cylc/task_job_mgr.py    | 5 +++--
 lib/cylc/task_state.py      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/cylc/task_events_mgr.py b/lib/cylc/task_events_mgr.py
index 38622a804a4..3530465229e 100644
--- a/lib/cylc/task_events_mgr.py
+++ b/lib/cylc/task_events_mgr.py
@@ -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':
diff --git a/lib/cylc/task_job_mgr.py b/lib/cylc/task_job_mgr.py
index ee5dcde14f1..1cba00a4e6b 100644
--- a/lib/cylc/task_job_mgr.py
+++ b/lib/cylc/task_job_mgr.py
@@ -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
@@ -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):
diff --git a/lib/cylc/task_state.py b/lib/cylc/task_state.py
index 70900cbf1d6..6560f7983c9 100644
--- a/lib/cylc/task_state.py
+++ b/lib/cylc/task_state.py
@@ -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,