Add shutdown hook for Hystrix to reset internal state and thread pool.

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java

+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.cloud.netflix.hystrix;
 
 import org.springframework.context.annotation.AdviceMode;
@@ -14,7 +29,8 @@ import java.lang.annotation.*;
 @Documented
 @Import(HystrixConfigurationSelector.class)
 public @interface EnableHystrix {
-    /**
+
+	/**
      * Indicate whether subclass-based (CGLIB) proxies are to be created ({@code true}) as
      * opposed to standard Java interface-based proxies ({@code false}). The default is
      * {@code false}. <strong>Applicable only if {@link #mode()} is set to

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java

+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.cloud.netflix.hystrix;
 
 import java.io.IOException;
@@ -9,6 +24,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.metrics.GaugeService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -23,12 +39,14 @@ import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.netflix.hystrix.Hystrix;
 import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect;
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller;
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller.MetricsAsJsonPollerListener;
 
 /**
  * @author Spencer Gibb
+ * @author Christian Dupuis
  */
 @Configuration
 public class HystrixConfiguration implements ImportAware {
@@ -36,9 +54,14 @@ public class HystrixConfiguration implements ImportAware {
 	private AnnotationAttributes enableHystrix;
 
 	@Bean
-	HystrixCommandAspect hystrixCommandAspect() {
+	public HystrixCommandAspect hystrixCommandAspect() {
 		return new HystrixCommandAspect();
 	}
+	
+	@Bean
+	public HystrixShutdownHook hystrixShutdownHook() {
+		return new HystrixShutdownHook();
+	}
 
 	@Bean
 	// TODO: add enable/disable
@@ -169,4 +192,13 @@ public class HystrixConfiguration implements ImportAware {
 		}
 
 	}
+	
+	private class HystrixShutdownHook implements DisposableBean {
+
+		@Override
+		public void destroy() throws Exception {
+			Hystrix.reset();
+			
+		}
+	}
 }

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationSelector.java

+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.cloud.netflix.hystrix;
 
 import org.springframework.context.annotation.AdviceMode;
@@ -8,7 +23,8 @@ import org.springframework.context.annotation.AutoProxyRegistrar;
  * @author Spencer Gibb
  */
 public class HystrixConfigurationSelector extends AdviceModeImportSelector<EnableHystrix> {
-    /**
+    
+	/**
      * The name of the AspectJ transaction management @{@code Configuration} class.
      */
     private static final String TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME =

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurer.java

+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.cloud.netflix.hystrix;
 
 /**

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpoint.java

+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.cloud.netflix.hystrix;
 
 import org.springframework.cloud.netflix.endpoint.ServletWrappingEndpoint;
@@ -5,9 +20,7 @@ import org.springframework.cloud.netflix.endpoint.ServletWrappingEndpoint;
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
 
 /**
- * User: spencergibb
- * Date: 4/22/14
- * Time: 3:16 PM
+ * @author Spencer Gibb
  */
 public class HystrixStreamEndpoint extends ServletWrappingEndpoint {