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

Revert "feat: remove RabbitHealthIndicator completely"

Browse Source 
This reverts commit baef3aea56.
This commit is contained in:
Gary Russell
2019-07-17 11:25:05 -04:00
parent baef3aea56
commit 2220bd9605
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java
View File

@@ -20,6 +20,8 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.actuate.amqp.RabbitHealthIndicator;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -51,11 +53,11 @@ import org.springframework.util.StringUtils;
* @author Ilayaperumal Gopinathan
* @author Artem Bilan
* @author Gary Russell
* @author Arnaud Deprez
*/
@Configuration
@ConditionalOnMissingBean(Binder.class)
@Import({ RabbitMessageChannelBinderConfiguration.class })
@Import({ RabbitMessageChannelBinderConfiguration.class,
RabbitServiceAutoConfiguration.RabbitHealthIndicatorConfiguration.class })
public abstract class RabbitServiceAutoConfiguration {
static void configureCachingConnectionFactory(
@@ -196,4 +198,19 @@ public abstract class RabbitServiceAutoConfiguration {
}
/**
* Configuration for Rabbit health indicator.
*
*/
@Configuration
@ConditionalOnClass(name = "org.springframework.boot.actuate.health.HealthIndicator")
public static class RabbitHealthIndicatorConfiguration {
@Bean
public HealthIndicator binderHealthIndicator(RabbitTemplate rabbitTemplate) {
return new RabbitHealthIndicator(rabbitTemplate);
}
}
}