Merge pull request #452 from mattrjacobs/plugins-reset

Add the capability to reset HystrixPlugins and make Hystrix.reset() invoke it
Netflix · Jan 7, 2015 · 670a3bf · 670a3bf
2 parents 8847054 + c93d319
commit 670a3bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java b/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java
@@ -4,6 +4,7 @@
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
 
+import com.netflix.hystrix.strategy.HystrixPlugins;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,6 +57,7 @@ private static void _reset() {
         HystrixCollapser.reset();
         // clear circuit breakers
         HystrixCircuitBreaker.Factory.reset();
+        HystrixPlugins.reset();
     }
 
     private static ThreadLocal<LinkedList<HystrixCommandKey>> currentCommand = new ThreadLocal<LinkedList<HystrixCommandKey>>() {

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/strategy/HystrixPlugins.java b/hystrix-core/src/main/java/com/netflix/hystrix/strategy/HystrixPlugins.java
@@ -55,6 +55,17 @@ public static HystrixPlugins getInstance() {
         return INSTANCE;
     }
 
+    /**
+     * Reset all of the HystrixPlugins to null.  You may invoke this directly, or it also gets invoked via <code>Hystrix.reset()</code>
+     */
+    public static void reset() {
+        getInstance().notifier.set(null);
+        getInstance().concurrencyStrategy.set(null);
+        getInstance().metricsPublisher.set(null);
+        getInstance().propertiesFactory.set(null);
+        getInstance().commandExecutionHook.set(null);
+    }
+
     /**
      * Retrieve instance of {@link HystrixEventNotifier} to use based on order of precedence as defined in {@link HystrixPlugins} class header.
      * <p>
@@ -279,4 +290,5 @@ private static Object getPluginImplementationViaProperty(Class<?> pluginClass) {
         }
     }
 
+
 }