From a6215ea68e4b8accfef5a5cec2133f440fec9fe0 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 25 Oct 2018 15:58:16 -0400 Subject: [PATCH] In fixing the incorrect behavior of what was previously in the handler shutdown method, I made the same mistake in a slightly different way. --- lib/galaxy/jobs/handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py index a481bba6e48..9e148ea855d 100644 --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -965,12 +965,12 @@ class DefaultJobDispatcher(object): job_wrapper.fail(DEFAULT_JOB_PUT_FAILURE_MESSAGE) def shutdown(self): + failures = [] for name, runner in self.job_runners.items(): - failures = [] try: runner.shutdown() except Exception: failures.append(name) log.exception("Failed to shutdown runner %s", name) - if failures: - raise Exception("Failed to shutdown runners: %s" % ', '.join(failures)) + if failures: + raise Exception("Failed to shutdown runners: %s" % ', '.join(failures))