queueworker.patch

diff -r 32e4527bab2d lib/galaxy/app.py
--- a/lib/galaxy/app.py	Fri Feb 06 09:00:23 2015 -0500
+++ b/lib/galaxy/app.py	Fri Feb 06 13:51:51 2015 -0500
@@ -18,7 +18,6 @@ from galaxy.tools.data_manager.manager i
 from galaxy.jobs import metrics as job_metrics
 from galaxy.web.base import pluginframework
 from galaxy.web.proxy import ProxyManager
-from galaxy.queue_worker import GalaxyQueueWorker
 from tool_shed.galaxy_install import update_repository_manager
 
 import logging
@@ -150,11 +149,6 @@ class UniverseApplication( object, confi
         self.workflow_scheduling_manager = scheduling_manager.WorkflowSchedulingManager( self )
 
         self.model.engine.dispose()
-        self.control_worker = GalaxyQueueWorker(self,
-                                                galaxy.queues.control_queue_from_config(self.config),
-                                                galaxy.queue_worker.control_message_to_task)
-        self.control_worker.daemon = True
-        self.control_worker.start()
 
     def shutdown( self ):
         self.workflow_scheduling_manager.shutdown()
diff -r 32e4527bab2d lib/galaxy/webapps/galaxy/buildapp.py
--- a/lib/galaxy/webapps/galaxy/buildapp.py	Fri Feb 06 09:00:23 2015 -0500
+++ b/lib/galaxy/webapps/galaxy/buildapp.py	Fri Feb 06 13:51:51 2015 -0500
@@ -18,6 +18,7 @@ import galaxy.datatypes.registry
 import galaxy.web.framework
 import galaxy.web.framework.webapp
 from galaxy import util
+from galaxy.queue_worker import GalaxyQueueWorker
 from galaxy.util import asbool
 from galaxy.util.properties import load_app_properties
 
@@ -102,6 +103,11 @@ def app_factory( global_conf, **kwargs )
     except:
         pass
 
+    app.control_worker = GalaxyQueueWorker(app,
+                                           galaxy.queues.control_queue_from_config(app.config),
+                                           galaxy.queue_worker.control_message_to_task)
+    app.control_worker.daemon = True
+    app.control_worker.start()
     # Return
     return webapp