From 5f3c681ac4954deba0d7c6d7b473a709c031afad Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 2 Jun 2014 11:14:18 -0400
Subject: [PATCH] Cleanly terminate the control worker.  Resolves a buildbot
 issue.

---
 lib/galaxy/app.py          | 2 ++
 lib/galaxy/queue_worker.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index 450158c4188..d41dde059ad 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -159,6 +159,8 @@ class UniverseApplication( object, config.ConfiguresGalaxyMixin ):
             self.heartbeat.shutdown()
         if self.update_manager:
             self.update_manager.shutdown()
+        if self.control_worker:
+            self.control_worker.shutdown()
         try:
             # If the datatypes registry was persisted, attempt to
             # remove the temporary file in which it was written.
diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py
index 76a4bcd7bee..0851689a120 100644
--- a/lib/galaxy/queue_worker.py
+++ b/lib/galaxy/queue_worker.py
@@ -63,6 +63,9 @@ class GalaxyQueueWorker(ConsumerMixin, threading.Thread):
             log.warning("Recieved a malformed task message:\n%s" % body)
         message.ack()
 
+    def shutdown(self):
+        self.should_stop = True
+
 
 def send_control_task(trans, task, noop_self=False, kwargs={}):
     log.info("Sending %s control task." % task)