opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-30 18:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Build on 1ed8dd5 for even simpler LWR param handling.

Browse Source
This commit is contained in:
John Chilton
2014-06-01 22:34:39 -05:00
parent 7ae38c5088
commit 6d8fd45ba8
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/lwr.py
+13 -14
View File
@@ -89,26 +89,25 @@ class LwrJobRunner( AsynchronousJobRunner ):
def __init__( self, app, nworkers, **kwds ):
"""Start the job runner """
super( LwrJobRunner, self ).__init__( app, nworkers, runner_param_specs=LWR_PARAM_SPECS, **kwds )
transport = self.runner_params.transport
cache = self.runner_params.cache
url = self.runner_params.url
self._init_worker_threads()
client_manager_kwargs = {
'transport_type': transport,
'cache': string_as_bool_or_none(cache),
"url": url,
'manager': kwds.get("manager", None),
}
for kwd in self.runner_params.keys():
if kwd.startswith('amqp_'):
client_manager_kwargs[kwd] = self.runner_params[kwd]
self.galaxy_url = self.runner_params.galaxy_url
self.client_manager = build_client_manager(**client_manager_kwargs)
if url:
self.__init_client_manager()
if self.runner_params.url:
# This is a message queue driven runner, don't monitor
# just setup required callback.
self.client_manager.ensure_has_status_update_callback(self.__async_update)
else:
self._init_monitor_thread()
def __init_client_manager( self ):
client_manager_kwargs = {}
for kwd in 'url', 'manager', 'cache', 'transport':
client_manager_kwargs[ kwd ] = self.runner_params[ kwd ]
for kwd in self.runner_params.keys():
if kwd.startswith( 'amqp_' ):
client_manager_kwargs[ kwd ] = self.runner_params[ kwd ]
self.client_manager = build_client_manager(**client_manager_kwargs)
def url_to_destination( self, url ):
"""Convert a legacy URL to a job destination"""
return JobDestination( runner="lwr", params=url_to_destination_params( url ) )
lib/galaxy/jobs/runners/lwr_client/manager.py
+2 -2
View File
@@ -44,7 +44,7 @@ class ClientManager(object):
self.job_manager_interface_args = dict(job_manager=kwds['job_manager'], file_cache=kwds['file_cache'])
else:
self.job_manager_interface_class = HttpLwrInterface
transport_type = kwds.get('transport_type', None)
transport_type = kwds.get('transport', None)
transport = get_transport(transport_type)
self.job_manager_interface_args = dict(transport=transport)
cache = kwds.get('cache', None)
@@ -138,7 +138,7 @@ class ObjectStoreClientManager(object):
self.interface_args = dict(object_store=kwds['object_store'])
else:
self.interface_class = HttpLwrInterface
transport_type = kwds.get('transport_type', None)
transport_type = kwds.get('transport', None)
transport = get_transport(transport_type)
self.interface_args = dict(transport=transport)
self.extra_client_kwds = {}