From a8ef24246ff6f30e9c697b5f0e56f95d9fba4ad3 Mon Sep 17 00:00:00 2001 From: Preetha Date: Thu, 16 Nov 2017 13:42:19 -0600 Subject: [PATCH] Fix ConsulHealthIndicator to stop reading internal config values from v1/agent/self and switch to a more stable API (#370) --- .../cloud/consul/ConsulHealthIndicator.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java index 314aac95..476bbd07 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java @@ -41,19 +41,13 @@ public class ConsulHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Health.Builder builder) throws Exception { - try { - Response self = consul.getAgentSelf(); - Config config = self.getValue().getConfig(); + try { + Response leaderStatus = consul.getStatusLeader(); Response>> services = consul .getCatalogServices(QueryParams.DEFAULT); builder.up() - .withDetail("services", services.getValue()) - .withDetail("advertiseAddress", config.getAdvertiseAddress()) - .withDetail("datacenter", config.getDatacenter()) - .withDetail("domain", config.getDomain()) - .withDetail("nodeName", config.getNodeName()) - .withDetail("bindAddress", config.getBindAddress()) - .withDetail("clientAddress", config.getClientAddress()); + .withDetail("leader", leaderStatus.getValue()) + .withDetail("services", services.getValue()); } catch (Exception e) { builder.down(e);