SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure app without Actuator can start

Browse Source
This commit is contained in:
Dave Syer
2014-12-04 15:15:38 +00:00
parent dfae445499
commit 4a6193e790
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.netflix.hystrix;
import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -34,7 +35,7 @@ import com.netflix.hystrix.Hystrix;
public class HystrixAutoConfiguration {
@Configuration
@ConditionalOnClass(Hystrix.class)
@ConditionalOnClass({Hystrix.class, HealthIndicator.class})
@ConditionalOnExpression("${health.hystrix.enabled:true}")
public static class HystrixHealthIndicatorConfiguration {