Merge pull request #1643 from DataDog/yann/file-to-stop-jmx

[jmxfetch][windows] write to file to exit JMXFetch

Author: yannmh

jmxfetch.py

@@ -9,6 +9,7 @@
 
 # datadog
 from util import get_os, yLoader, yDumper
+from utils.platform import Platform
 from config import get_config, get_confd_path, get_jmx_status_path, get_logging_config, \
     PathNotFound, DEFAULT_CHECK_FREQUENCY
 
@@ -49,6 +50,7 @@
     JMX_COLLECT_COMMAND: "Start the collection of metrics based on your current configuration and display them in the console"}
 
 PYTHON_JMX_STATUS_FILE = 'jmx_status_python.yaml'
+PYTHON_JMX_EXIT_FILE = 'jmxfetch_exit'
 
 LINK_TO_DOC = "See http://docs.datadoghq.com/integrations/java/ for more information"
 
@@ -232,6 +234,13 @@ def _start(self, path_to_java, java_run_opts, jmx_checks, command, reporter, too
                 command,  # Name of the command
             ]
 
+            if Platform.is_windows():
+                # Signal handlers are not supported on Windows:
+                # use a file to trigger JMXFetch exit instead
+                path_to_exit_file = os.path.join(get_jmx_status_path(), PYTHON_JMX_EXIT_FILE)
+                subprocess_args.insert(len(subprocess_args) - 1, '--exit_file_location')
+                subprocess_args.insert(len(subprocess_args) - 1, path_to_exit_file)
+
             subprocess_args.insert(4, '--check')
             for check in jmx_checks:
                 subprocess_args.insert(5, check)
@@ -379,12 +388,31 @@ def _is_jmx_check(self, check_config, check_name, checks_list):
         return is_jmx, java_bin_path, java_options, tools_jar_path
 
     def _get_path_to_jmxfetch(self):
-        if get_os() != 'windows':
+        if not Platform.is_windows():
             return os.path.realpath(os.path.join(os.path.abspath(__file__), "..", "checks",
                                     "libs", JMX_FETCH_JAR_NAME))
         return os.path.realpath(os.path.join(os.path.abspath(__file__), "..", "..",
                                 "jmxfetch", JMX_FETCH_JAR_NAME))
 
+    @staticmethod
+    def write_exit_file():
+        """
+        Create a 'special' file, which acts as a trigger to exit JMXFetch.
+        Note: Windows only
+        """
+        open(os.path.join(get_jmx_status_path(), PYTHON_JMX_EXIT_FILE), 'a').close()
+
+    @staticmethod
+    def clean_exit_file():
+        """
+        Remove exit file trigger -may not exist-.
+        Note: Windows only
+        """
+        try:
+            os.remove(os.path.join(get_jmx_status_path(), PYTHON_JMX_EXIT_FILE))
+        except OSError:
+            pass
+
 
 def _clean_status_file():
     """

win32/agent.py

@@ -193,8 +193,6 @@ def run(self):
     def stop(self):
         log.debug("Windows Service - Stopping collector")
         self.collector.stop()
-        if JMXFetch.is_running():
-            JMXFetch.stop()
         self.running = False
 
     def get_emitters(self):
@@ -282,10 +280,14 @@ def __init__(self, agentConfig, hostname):
 
     def run(self):
         if self.is_enabled:
+            JMXFetch.clean_exit_file()
             self.jmx_daemon.run()
 
-    def stop(self):
-        pass
+    def terminate(self):
+        """
+        Override `terminate` method to properly exit JMXFetch.
+        """
+        JMXFetch.write_exit_file()
 
 
 if __name__ == '__main__':