wyl/spring-cloud-openfeign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge 3.1.x

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-03-30 13:59:03 +02:00
parent 2a008d12c8 573d933b3d
commit 2b1ac9caa8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java
+2 -1
View File
@@ -110,8 +110,9 @@ public class FeignBlockingLoadBalancerClient implements Client {
} }
String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri).toString(); String reconstructedUrl = loadBalancerClient.reconstructURI(instance, originalUri).toString();
Request newRequest = buildRequest(request, reconstructedUrl); Request newRequest = buildRequest(request, reconstructedUrl);
LoadBalancerProperties loadBalancerProperties = loadBalancerClientFactory.getProperties(serviceId);
return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbRequest, lbResponse, return executeWithLoadBalancerLifecycleProcessing(delegate, options, newRequest, lbRequest, lbResponse,
supportedLifecycleProcessors); supportedLifecycleProcessors, loadBalancerProperties.isUseRawStatusCodeInResponseData());
} }
protected Request buildRequest(Request request, String reconstructedUrl) { protected Request buildRequest(Request request, String reconstructedUrl) {
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java
+3 -2
View File
@@ -163,9 +163,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
} }
org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse( org.springframework.cloud.client.loadbalancer.Response<ServiceInstance> lbResponse = new DefaultResponse(
retrievedServiceInstance); retrievedServiceInstance);
LoadBalancerProperties loadBalancerProperties = loadBalancerClientFactory.getProperties(serviceId);
Response response = LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing(delegate, options, Response response = LoadBalancerUtils.executeWithLoadBalancerLifecycleProcessing(delegate, options,
feignRequest, lbRequest, lbResponse, supportedLifecycleProcessors, feignRequest, lbRequest, lbResponse, supportedLifecycleProcessors, retrievedServiceInstance != null,
retrievedServiceInstance != null); loadBalancerProperties.isUseRawStatusCodeInResponseData());
int responseStatus = response.status(); int responseStatus = response.status();
if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) { if (retryPolicy != null && retryPolicy.retryableStatusCode(responseStatus)) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {