commit/galaxy-central: jmchilton: LWR bugfix - cannot have trailing / for galaxy_url runner arg.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/97b2942c9788/ Changeset: 97b2942c9788 User: jmchilton Date: 2014-06-16 05:29:05 Summary: LWR bugfix - cannot have trailing / for galaxy_url runner arg. Affected #: 2 files diff -r e15e1c346f76f6cf034b51c82befb9abb4ed26cb -r 97b2942c978887922705b9f8bb26ccdea6f707b4 job_conf.xml.sample_advanced --- a/job_conf.xml.sample_advanced +++ b/job_conf.xml.sample_advanced @@ -37,7 +37,7 @@ <!-- If using message queue driven LWR - the LWR will generally initiate file transfers so a the URL of this Galaxy instance must be configured. --> - <param id="galaxy_url">http://localhost:8080/</param> + <param id="galaxy_url">http://localhost:8080</param><!-- If multiple managers configured on the LWR, specify which one this plugin targets. --><!-- <param id="manager">_default_</param> --> diff -r e15e1c346f76f6cf034b51c82befb9abb4ed26cb -r 97b2942c978887922705b9f8bb26ccdea6f707b4 lib/galaxy/jobs/runners/lwr.py --- a/lib/galaxy/jobs/runners/lwr.py +++ b/lib/galaxy/jobs/runners/lwr.py @@ -106,7 +106,10 @@ """Start the job runner """ super( LwrJobRunner, self ).__init__( app, nworkers, runner_param_specs=LWR_PARAM_SPECS, **kwds ) self._init_worker_threads() - self.galaxy_url = self.runner_params.galaxy_url + galaxy_url = self.runner_params.galaxy_url + if galaxy_url: + galaxy_url.rstrip("/") + self.galaxy_url = galaxy_url self.__init_client_manager() if self.runner_params.url: # This is a message queue driven runner, don't monitor 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.
participants (1)
-
commits-noreply@bitbucket.org