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

Log health check exceptions.

Browse Source 
We now rely on the exception handling of AbstractHealthIndicator and AbstractReactiveHealthIndicator by removing our own exception handling code.

Closes gh-242.
This commit is contained in:
Mark Paluch
2018-09-10 15:18:05 +02:00
parent bd82f5e82c
commit a8c4910d04
2 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java
View File

@@ -35,38 +35,30 @@ public class VaultHealthIndicator extends AbstractHealthIndicator {
this.vaultOperations = vaultOperations;
}
@Override
protected void doHealthCheck(Builder builder) {
try {
VaultHealth vaultHealthResponse = vaultOperations.opsForSys().health();
VaultHealth vaultHealthResponse = vaultOperations.opsForSys().health();
if (!vaultHealthResponse.isInitialized()) {
builder.down().withDetail("state", "Vault uninitialized");
}
else
if (vaultHealthResponse.isSealed()) {
builder.down().withDetail("state", "Vault sealed");
}
else
if (vaultHealthResponse.isStandby()) {
builder.up().withDetail("state", "Vault in standby");
}
else {
builder.up();
}
if (StringUtils.hasText(vaultHealthResponse.getVersion())) {
builder.withDetail("version",
vaultHealthResponse.getVersion());
}
if (!vaultHealthResponse.isInitialized()) {
builder.down().withDetail("state", "Vault uninitialized");
}
catch (Exception e) {
builder.down(e);
else
if (vaultHealthResponse.isSealed()) {
builder.down().withDetail("state", "Vault sealed");
}
else
if (vaultHealthResponse.isStandby()) {
builder.up().withDetail("state", "Vault in standby");
}
else {
builder.up();
}
if (StringUtils.hasText(vaultHealthResponse.getVersion())) {
builder.withDetail("version", vaultHealthResponse.getVersion());
}
}
}

23
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java
View File

@@ -49,21 +49,14 @@ public class VaultReactiveHealthIndicator extends AbstractReactiveHealthIndicato
@Override
protected Mono<Health> doHealthCheck(Builder builder) {
try {
return vaultOperations
.doWithSession(it -> it.get().uri("sys/health").exchange())
.flatMap(it -> it.bodyToMono(VaultHealthImpl.class))
.onErrorResume(WebClientResponseException.class,
VaultReactiveHealthIndicator::deserializeError)
.map(vaultHealthResponse -> {
return getHealth(builder, vaultHealthResponse);
});
}
catch (Exception e) {
return Mono.just(builder.down(e).build());
}
return vaultOperations
.doWithSession(it -> it.get().uri("sys/health").exchange())
.flatMap(it -> it.bodyToMono(VaultHealthImpl.class))
.onErrorResume(WebClientResponseException.class,
VaultReactiveHealthIndicator::deserializeError)
.map(vaultHealthResponse -> {
return getHealth(builder, vaultHealthResponse);
});
}
private static Mono<? extends VaultHealthImpl> deserializeError(