opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable the lwr & dynamic job runners automatically. Neither require

Browse Source 
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.
This commit is contained in:
John Chilton
2012-08-14 23:38:24 -05:00
parent 95119845d9
commit 79937a5398
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/handler.py
+1 -1
View File
@@ -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:
lib/galaxy/tools/__init__.py
+5 -10
View File
@@ -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)