5 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/75304086e0b9/ Changeset: 75304086e0b9 Branch: docker-work User: davebgx Date: 2014-10-06 13:10:58+00:00 Summary: Close merged branch docker-work. Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/89c5e7289942/ Changeset: 89c5e7289942 Branch: tool-autoload User: davebgx Date: 2014-10-06 13:11:16+00:00 Summary: Close merged branch tool-autoload. Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/92ccf23d883c/ Changeset: 92ccf23d883c Branch: tool-extract User: davebgx Date: 2014-10-06 13:11:28+00:00 Summary: Close merged branch tool-extract. Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/1f36c142db9c/ Changeset: 1f36c142db9c Branch: jjohnson/sqlite-needs-to-import-re-and-sqlite-in--1412274859337 User: davebgx Date: 2014-10-06 13:11:40+00:00 Summary: Close merged branch jjohnson/sqlite-needs-to-import-re-and-sqlite-in--1412274859337. Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/8f746975db66/ Changeset: 8f746975db66 User: davebgx Date: 2014-10-06 13:12:06+00:00 Summary: Add api method to reload a tool's configuration. Affected #: 2 files diff -r d252ac015734d6e382ff07a0497a84ac575059e2 -r 8f746975db66785dcec2ef16f943052d767b01d4 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -3,6 +3,7 @@ from galaxy import exceptions from galaxy import web, util from galaxy.web import _future_expose_api_anonymous +from galaxy.web import _future_expose_api from galaxy.web.base.controller import BaseAPIController from galaxy.web.base.controller import UsesVisualizationMixin from galaxy.web.base.controller import UsesHistoryMixin @@ -12,6 +13,8 @@ from galaxy.managers.collections_util import dictify_dataset_collection_instance +import galaxy.queue_worker + import logging log = logging.getLogger( __name__ ) @@ -58,6 +61,18 @@ tool = self._get_tool( id ) return tool.to_dict( trans, io_details=io_details, link_details=link_details ) + @_future_expose_api + @web.require_admin + def reload( self, trans, tool_id, **kwd ): + """ + GET /api/tools/{tool_id}/reload + Reload specified tool. + """ + toolbox = trans.app.toolbox + galaxy.queue_worker.send_control_task( trans, 'reload_tool', noop_self=True, kwargs={ 'tool_id': tool_id } ) + message, status = trans.app.toolbox.reload_tool_by_id( tool_id ) + return { status: message } + @_future_expose_api_anonymous def citations( self, trans, id, **kwds ): tool = self._get_tool( id ) diff -r d252ac015734d6e382ff07a0497a84ac575059e2 -r 8f746975db66785dcec2ef16f943052d767b01d4 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -179,6 +179,7 @@ webapp.mapper.resource( 'ftp_file', 'ftp_files', path_prefix='/api' ) webapp.mapper.resource( 'group', 'groups', path_prefix='/api' ) webapp.mapper.resource_with_deleted( 'quota', 'quotas', path_prefix='/api' ) + webapp.mapper.connect( '/api/tools/{id:.+?}/reload', action='reload', controller="tools" ) webapp.mapper.connect( '/api/tools/{id:.+?}/citations', action='citations', controller="tools" ) webapp.mapper.connect( '/api/tools/{id:.+?}/download', action='download', controller="tools" ) webapp.mapper.connect( '/api/tools/{id:.+?}', action='show', controller="tools" ) 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.