root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish 'Drop blocking RedisReactiveHealthIndicator calls' 

See gh-16756
This commit is contained in:
Phillip Webb 2019-05-14 21:23:31 -07:00
parent de857372a5
commit f790556f96
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@ -46,14 +46,20 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
@Override
protected Mono<Health> doHealthCheck(Health.Builder builder) {
Mono<ReactiveRedisConnection> connection = Mono
.fromSupplier(this.connectionFactory::getReactiveConnection)
.subscribeOn(Schedulers.parallel());
return getConnection()
.flatMap((connection) -> doHealthCheck(builder, connection));
}
return connection
.flatMap((c) -> c.serverCommands().info().map((info) -> up(builder, info))
.onErrorResume((e) -> Mono.just(builder.down(e).build()))
.flatMap((signal) -> c.closeLater().thenReturn(signal)));
private Mono<Health> doHealthCheck(Health.Builder builder,
ReactiveRedisConnection connection) {
return connection.serverCommands().info().map((info) -> up(builder, info))
.onErrorResume((ex) -> Mono.just(down(builder, ex)))
.flatMap((health) -> connection.closeLater().thenReturn(health));
}
private Mono<ReactiveRedisConnection> getConnection() {
return Mono.fromSupplier(this.connectionFactory::getReactiveConnection)
.subscribeOn(Schedulers.parallel());
}
private Health up(Health.Builder builder, Properties info) {
@ -61,4 +67,8 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
info.getProperty(RedisHealthIndicator.REDIS_VERSION)).build();
}
private Health down(Health.Builder builder, Throwable cause) {
return builder.down(cause).build();
}
}