1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/1ce9b9138a59/ changeset: 1ce9b9138a59 user: jmchilton date: 2012-08-15 06:38:24 summary: 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. affected #: 2 files diff -r f557b7b05fdd701cbf99ee04f311bcadb1ae29c4 -r 1ce9b9138a59da9cce64cb795e55154a70d51cb1 lib/galaxy/jobs/handler.py --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -360,7 +360,7 @@ 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 -r f557b7b05fdd701cbf99ee04f311bcadb1ae29c4 -r 1ce9b9138a59da9cce64cb795e55154a70d51cb1 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -922,16 +922,11 @@ 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) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.