Move tool_cache.reset_status() calls to reload toolbox/data managers,…

… so that we can use information about whether tools are new during reloads
galaxyproject · May 1, 2017 · 6c22726 · 6c22726
1 parent 2906f0c
commit 6c22726
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
@@ -956,7 +956,6 @@ def reindex_tool_search( self ):
             self.toolbox_search = galaxy.tools.search.ToolBoxSearch( toolbox, index_help )
         else:
             self.toolbox_search.update_index(tool_cache=self.tool_cache)
-        self.tool_cache.reset_status()
 
     def _configure_tool_data_tables( self, from_shed_config ):
         from galaxy.tools.data import ToolDataTableManager

diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py
@@ -116,6 +116,7 @@ def _get_new_toolbox(app):
     new_toolbox.load_hidden_lib_tool( "galaxy/datatypes/set_metadata_tool.xml" )
     [new_toolbox.register_tool(tool) for tool in new_toolbox.data_manager_tools.values()]
     app.reindex_tool_search()
+    app.tool_cache.reset_status()
     return new_toolbox
 
 
@@ -130,6 +131,7 @@ def reload_data_managers(app, **kwargs):
     app.data_managers = DataManagers(app)
     app.data_managers._reload_count = reload_count + 1
     app.tool_version_cache = ToolVersionCache(app)
+    app.tool_cache.reset_status()
     end = time.time() - start
     log.debug("Data Manager reload took %f seconds", end)