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

updates for changes in s-c-commons

Browse Source
This commit is contained in:
Spencer Gibb
2014-12-02 16:46:46 -07:00
parent 9d63c776a8
commit 4e7d380435
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLoadBalancerClient.java
View File

@@ -1,5 +1,6 @@
package org.springframework.cloud.consul.discovery;
import com.google.common.base.Throwables;
import com.netflix.client.config.DefaultClientConfigImpl;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.*;
@@ -9,7 +10,9 @@ import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest;
import org.springframework.cloud.consul.client.CatalogClient;
import org.springframework.web.util.UriComponentsBuilder;
import java.net.URI;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -50,7 +53,22 @@ public class ConsulLoadBalancerClient implements LoadBalancerClient {
}
@Override
public <T> T choose(String serviceId, LoadBalancerRequest<T> request) {
return request.apply(choose(serviceId));
public <T> T execute(String serviceId, LoadBalancerRequest<T> request) {
try {
return request.apply(choose(serviceId));
} catch (Exception e) {
Throwables.propagate(e);
return null;
}
}
@Override
public URI reconstructURI(ServiceInstance instance, URI original) {
URI uri = UriComponentsBuilder.fromUri(original)
.host(instance.getHost())
.port(instance.getPort())
.build()
.toUri();
return uri;
}
}