Merge pull request #15 from signalfx/add_shutdown_cleanup

Add plugin shutdown to cleanup log handler

dockerplugin.py

@@ -463,7 +463,8 @@ def init_callback(self):
                       .format(url=self.docker_url))
             return False
 
-        collectd.register_read(self.read_callback, interval=COLLECTION_INTERVAL)
+        collectd.register_read(self.read_callback,
+                               interval=COLLECTION_INTERVAL)
         log.notice(('Collecting stats about Docker containers from {url} '
                     '(API version {version}; timeout: {timeout}s).')
                    .format(url=self.docker_url,
@@ -601,6 +602,12 @@ def notice(self, msg):
         self.log(25, msg)
 
 
+def shutdown():
+    """Cleanup on plugin shutdown."""
+    log.info("dockerplugin shutting down")
+    log.removeHandler(handle)
+
+
 # Set up logging
 logging.setLoggerClass(CollectdLogger)
 log = logging.getLogger(__name__)
@@ -624,7 +631,6 @@ def dispatch(self):
             print 'PUTVAL', identifier, \
                 ':'.join(map(str, [int(self.time)] + self.values))
 
-
     class ExecCollectd:
         def Values(self):
             return ExecCollectdValues()
@@ -647,7 +653,6 @@ def info(self, msg):
         def debug(self, msg):
             print 'DEBUG: ', msg
 
-
     collectd = ExecCollectd()
     plugin = DockerPlugin()
     if len(sys.argv) > 1:
@@ -668,3 +673,4 @@ def debug(self, msg):
     plugin = DockerPlugin()
     collectd.register_config(plugin.configure_callback)
     collectd.register_init(plugin.init_callback)
+    collectd.register_shutdown(shutdown)