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

Log Exception from ConsulHealthIndicator (#454)

Browse Source 
- Removed `try...catch` block from `ConsulHealthIndicator` to let
`AbstractHealthIndicator` log and handle the `Exception` appropriately
- Added tests for UP and DOWN status

Fixes gh-447
This commit is contained in:
Lomesh Patel
2018-12-13 13:20:39 -05:00
committed by Spencer Gibb
parent 3ab7de8acd
commit c65573ddb5
3 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulHealthIndicator.java
View File

@@ -25,8 +25,6 @@ import org.springframework.boot.actuate.health.Health;
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.QueryParams;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.agent.model.Self;
import com.ecwid.consul.v1.agent.model.Self.Config;
/**
* @author Spencer Gibb
@@ -41,16 +39,10 @@ public class ConsulHealthIndicator extends AbstractHealthIndicator {
@Override
protected void doHealthCheck(Health.Builder builder) throws Exception {
try {
Response<String> leaderStatus = consul.getStatusLeader();
Response<Map<String, List<String>>> services = consul
.getCatalogServices(QueryParams.DEFAULT);
builder.up()
.withDetail("leader", leaderStatus.getValue())
.withDetail("services", services.getValue());
}
catch (Exception e) {
builder.down(e);
}
final Response<String> leaderStatus = consul.getStatusLeader();
final Response<Map<String, List<String>>> services = consul
.getCatalogServices(QueryParams.DEFAULT);
builder.up().withDetail("leader", leaderStatus.getValue()).withDetail("services",
services.getValue());
}
}

35
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorDownTest.java Normal file
View File

@@ -0,0 +1,35 @@
package org.springframework.cloud.consul;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.actuate.health.HealthEndpoint;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* @author Lomesh Patel (lomeshpatel)
*/
@RunWith(SpringRunner.class)
@SpringBootTest(properties = "spring.cloud.consul.host=invalidhost")
public class ConsulHealthIndicatorDownTest {
@Autowired
private HealthEndpoint healthEndpoint;
@Test
public void doHealthCheck() {
assertEquals("health status was not DOWN", Status.DOWN,
healthEndpoint.health().getStatus());
}
@EnableAutoConfiguration
@SpringBootConfiguration
protected static class TestConfig {
}
}

35
spring-cloud-consul-core/src/test/java/org/springframework/cloud/consul/ConsulHealthIndicatorUpTest.java Normal file
View File

@@ -0,0 +1,35 @@
package org.springframework.cloud.consul;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.actuate.health.HealthEndpoint;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
/**
* @author Lomesh Patel (lomeshpatel)
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class ConsulHealthIndicatorUpTest {
@Autowired
private HealthEndpoint healthEndpoint;
@Test
public void doHealthCheck() {
assertEquals("health status was not UP", Status.UP,
healthEndpoint.health().getStatus());
}
@EnableAutoConfiguration
@SpringBootConfiguration
protected static class TestConfig {
}
}