Shutdown watchers during app shutdown.

galaxyproject · Oct 31, 2017 · 68c5ebc · 68c5ebc
1 parent be30d68
commit 68c5ebc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
@@ -212,6 +212,7 @@ def postfork_sentry_client():
         log.info("Galaxy app startup finished %s" % self.startup_timer)
 
     def shutdown(self):
+        self.watchers.shutdown()
         self.workflow_scheduling_manager.shutdown()
         self.job_manager.shutdown()
         self.object_store.shutdown()

diff --git a/lib/galaxy/webapps/galaxy/config_watchers.py b/lib/galaxy/webapps/galaxy/config_watchers.py
@@ -32,6 +32,12 @@ def start(self):
         [self.data_manager_config_watcher.watch_file(config) for config in self.data_manager_configs]
         [self.tool_data_watcher.watch_directory(tool_data_path) for tool_data_path in self.tool_data_paths]
 
+    def shutdown(self):
+        self.tool_config_watcher.shutdown()
+        self.data_manager_config_watcher.shutdown()
+        self.tool_data_watcher.shutdown()
+        self.tool_watcher.shutdown()
+
     def update_watch_data_table_paths(self):
         if hasattr(self.tool_data_watcher, 'monitored_dirs'):
             for tool_data_table_path in self.tool_data_paths: