Skip to content

S
spring-cloud-netflix
Commit 4a6193e7 by Dave Syer
Options

Ensure app without Actuator can start

parent dfae4454
Showing with 2 additions and 1 deletion
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.cloud.netflix.hystrix; package org.springframework.cloud.netflix.hystrix;
import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration; 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.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
...@@ -34,7 +35,7 @@ import com.netflix.hystrix.Hystrix; ...@@ -34,7 +35,7 @@ import com.netflix.hystrix.Hystrix;
public class HystrixAutoConfiguration { public class HystrixAutoConfiguration {
@Configuration @Configuration
@ConditionalOnClass(Hystrix.class) @ConditionalOnClass({Hystrix.class, HealthIndicator.class})
@ConditionalOnExpression("${health.hystrix.enabled:true}") @ConditionalOnExpression("${health.hystrix.enabled:true}")
public static class HystrixHealthIndicatorConfiguration { public static class HystrixHealthIndicatorConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment