Merge pull request dropwizard#106 from datafueled/shutdown

Add a shutdown method to Metrics to make it easier to shut everything down.
chids · Nov 16, 2011 · 1d7ecbe · 1d7ecbe
2 parents 77e55df + 945655d
commit 1d7ecbe
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/metrics-core/src/main/java/com/yammer/metrics/Metrics.java b/metrics-core/src/main/java/com/yammer/metrics/Metrics.java
@@ -3,6 +3,7 @@
 import com.yammer.metrics.core.*;
 import com.yammer.metrics.reporting.ConsoleReporter;
 import com.yammer.metrics.reporting.JmxReporter;
+import com.yammer.metrics.util.Utils;
 
 import javax.management.MalformedObjectNameException;
 import java.util.Map;
@@ -13,15 +14,16 @@
  */
 public class Metrics {
     private static final MetricsRegistry DEFAULT_REGISTRY = new MetricsRegistry();
+    private static final Thread SHUTDOWN_HOOK = new Thread() {
+        public void run() {
+            JmxReporter.shutdownDefault();
+        }
+    };
     static {{
         JmxReporter.startDefault(DEFAULT_REGISTRY);
         // make sure we initialize this so it can monitor GC etc
         VirtualMachineMetrics.daemonThreadCount();
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            public void run() {
-                JmxReporter.shutdownDefault();
-            }
-        });
+        Runtime.getRuntime().addShutdownHook(SHUTDOWN_HOOK);
     }}
 
     private Metrics() { /* unused */ }
@@ -441,4 +443,11 @@ public static Map<MetricName, Metric> allMetrics() {
     public static MetricsRegistry defaultRegistry() {
         return DEFAULT_REGISTRY;
     }
+
+    public static void shutdown() {
+        Utils.shutdownThreadPools();
+        DEFAULT_REGISTRY.threadPools().shutdownThreadPools();
+        JmxReporter.shutdownDefault();
+        Runtime.getRuntime().removeShutdownHook(SHUTDOWN_HOOK);
+    }
 }