diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 43a75b93..b7bb7245 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -32,12 +32,12 @@ |spring.cloud.consul.discovery.health-check-timeout | | Timeout for health check (e.g. 10s). |spring.cloud.consul.discovery.health-check-tls-skip-verify | | Skips certificate verification during service checks if true, otherwise runs certificate verification. |spring.cloud.consul.discovery.health-check-url | | Custom health check url to override default. -|spring.cloud.consul.discovery.heartbeat.actuator-health-group | | The actuator health group to use (`null` for the root group) when determining system health via Actuator. +|spring.cloud.consul.discovery.heartbeat.actuator-health-group | | The actuator health group to use (null for the root group) when determining system health via Actuator. |spring.cloud.consul.discovery.heartbeat.enabled | `+++false+++` | |spring.cloud.consul.discovery.heartbeat.interval-ratio | | |spring.cloud.consul.discovery.heartbeat.reregister-service-on-failure | `+++false+++` | -|spring.cloud.consul.discovery.heartbeat.use-actuator-health | `true` | Whether or not to take the current system health (as reported via the Actuator Health endpoint) into account when reporting the application status to the Consul TTL check. Actuator Health endpoint also has to be available to the application. |spring.cloud.consul.discovery.heartbeat.ttl | `+++30s+++` | +|spring.cloud.consul.discovery.heartbeat.use-actuator-health | `+++true+++` | Whether or not to take the current system health (as reported via the Actuator Health endpoint) into account when reporting the application status to the Consul TTL check. Actuator Health endpoint also has to be available to the application. |spring.cloud.consul.discovery.hostname | | Hostname to use when accessing server. |spring.cloud.consul.discovery.include-hostname-in-instance-id | `+++false+++` | Whether hostname is included into the default instance id when registering service. |spring.cloud.consul.discovery.instance-group | | Service instance group. @@ -81,4 +81,4 @@ |spring.cloud.consul.tls.key-store-password | | Password to an external keystore. |spring.cloud.consul.tls.key-store-path | | Path to an external keystore. -|=== +|=== \ No newline at end of file diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java index 9f2c6bcb..8d123a6a 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java @@ -127,20 +127,20 @@ public class TtlScheduler { ConsulClient client = this.ttlScheduler.client; CheckStatus status = statusSupplier.get(); switch (status) { - case PASSING: - possiblyReregisterIfFails(() -> client.agentCheckPass(checkId)); - logHeartbeatSent(status); - break; - case WARNING: - possiblyReregisterIfFails(() -> client.agentCheckWarn(checkId)); - logHeartbeatSent(status); - break; - case CRITICAL: - possiblyReregisterIfFails(() -> client.agentCheckFail(checkId)); - logHeartbeatSent(status); - break; - default: - log.debug(String.format("Not sending consul heartbeat for %s (%s)", checkId, status)); + case PASSING: + possiblyReregisterIfFails(() -> client.agentCheckPass(checkId)); + logHeartbeatSent(status); + break; + case WARNING: + possiblyReregisterIfFails(() -> client.agentCheckWarn(checkId)); + logHeartbeatSent(status); + break; + case CRITICAL: + possiblyReregisterIfFails(() -> client.agentCheckFail(checkId)); + logHeartbeatSent(status); + break; + default: + log.debug(String.format("Not sending consul heartbeat for %s (%s)", checkId, status)); } }