diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java index 118d0a1e..a284309e 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultHealthIndicator.java @@ -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()); } } } diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java index 8c923d84..bd57b321 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicator.java @@ -49,21 +49,14 @@ public class VaultReactiveHealthIndicator extends AbstractReactiveHealthIndicato @Override protected Mono 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 deserializeError(