From 79937a5398fbf74f168c6ad706f3bfb1fe9b7d65 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 14 Aug 2012 23:38:24 -0500
Subject: [PATCH] Enable the lwr & dynamic job runners automatically. Neither
 require any special libraries and deployers must assign tools to use them
 before they have any affect on Galaxy (i.e. no subtle/implicit behaviors), so
 I don't anticipate any down side to doing this. Also clean up logic in
 lib/galaxy/jobs/handler.py a little to accommodate this.

---
 lib/galaxy/jobs/handler.py   |  2 +-
 lib/galaxy/tools/__init__.py | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py
index 55ffe39c165..9fe115277e0 100644
--- a/lib/galaxy/jobs/handler.py
+++ b/lib/galaxy/jobs/handler.py
@@ -360,7 +360,7 @@ class DefaultJobDispatcher( object ):
     def __init__( self, app ):
         self.app = app
         self.job_runners = {}
-        start_job_runners = ["local"]
+        start_job_runners = ["local", "lwr", "dynamic"]
         if app.config.start_job_runners is not None:
             start_job_runners.extend( [ x.strip() for x in util.listify( app.config.start_job_runners ) ] )
         if app.config.use_tasked_jobs:
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 08ce7a0642e..b829f86f5a2 100755
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -922,16 +922,11 @@ class Tool:
         if self_id in self.app.config.tool_handlers:
             self.job_handlers = self.app.config.tool_handlers[ self_id ]
         # Set job runner(s). Each runner is a dict with 'url' and, optionally, 'params'.
-        if self.app.config.start_job_runners is None:
-            # Jobs are always local regardless of tool config if no additional
-            # runners are started
-            self.job_runners = [ { "url" : "local:///" } ]
-        else:
-            # Set job runner to the cluster default
-            self.job_runners = [ { "url" : self.app.config.default_cluster_job_runner } ]
-            # Set custom runner(s) if they're defined.
-            if self_id in self.app.config.tool_runners:
-                self.job_runners = self.app.config.tool_runners[ self_id ]
+        # Set job runner to the cluster default
+        self.job_runners = [ { "url" : self.app.config.default_cluster_job_runner } ]
+        # Set custom runner(s) if they're defined.
+        if self_id in self.app.config.tool_runners:
+            self.job_runners = self.app.config.tool_runners[ self_id ]
         # Is this a 'hidden' tool (hidden in tool menu)
         self.hidden = util.xml_text(root, "hidden")
         if self.hidden: self.hidden = util.string_as_bool(self.hidden)