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

Add the option to only query for services that are passing health checks.

Browse Source
This commit is contained in:
Spencer Gibb
2016-02-24 16:45:41 -07:00
parent db62855c22
commit 3f3fccd01a
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClient.java
View File

@@ -110,7 +110,7 @@ public class ConsulDiscoveryClient implements DiscoveryClient {
private void addInstancesToList(List<ServiceInstance> instances, String serviceId) {
Response<List<HealthService>> services = client.getHealthServices(serviceId,
false, QueryParams.DEFAULT);
this.properties.isQueryPassing(), QueryParams.DEFAULT);
for (HealthService service : services.getValue()) {
String host = findHost(service);
instances.add(new DefaultServiceInstance(serviceId, host, service

6
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
View File

@@ -114,6 +114,12 @@ public class ConsulDiscoveryProperties {
*/
private Map<String, String> serverListQueryTags = new HashMap<>();
/**
* Add the 'passing` parameter to /v1/health/service/serviceName.
* This pushes health check passing to the server.
*/
private boolean queryPassing = false;
@SuppressWarnings("unused")
private ConsulDiscoveryProperties() {}

7
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulServerList.java
View File

@@ -58,12 +58,13 @@ public class ConsulServerList extends AbstractServerList<ConsulServer> {
}
private List<ConsulServer> getServers() {
if (client == null) {
if (this.client == null) {
return Collections.emptyList();
}
String tag = getTag(); // null is ok
Response<List<HealthService>> response = client.getHealthServices(
this.serviceId, tag, false, QueryParams.DEFAULT);
Response<List<HealthService>> response = this.client.getHealthServices(
this.serviceId, tag, this.properties.isQueryPassing(),
QueryParams.DEFAULT);
if (response.getValue() == null || response.getValue().isEmpty()) {
return Collections.emptyList();
}