Commit e89fb371 authored by zhouwei's avatar zhouwei

超时时间逻辑有修改

parent fb1ce114
......@@ -186,14 +186,13 @@ public class FailoverGatewayFilterFactory extends AbstractGatewayFilterFactory<F
exchange,
true,
errorStats
).timeout(Duration.ofMillis(appConfig.getRequestTimeout()))
.onErrorResume(throwable -> {
).onErrorResume(throwable -> {
log.error("Primary endpoint failed: {}, error: {}",
uriConfig.getPrimaryUrl() + sourceUri,
throwable.getMessage());
long duration = System.currentTimeMillis() - startTime;
log.info("Source request error:{} took:{}ms, switching to target: {} request id:{}",
throwable.getMessage(),duration, uriConfig.getTargetUri(), exchange.getAttributes().get(REQUEST_ID));
throwable.getMessage(), duration, uriConfig.getTargetUri(), exchange.getAttributes().get(REQUEST_ID));
// 记录错误
getOrCreateErrorStats(uriConfig.getPrimaryUrl()).add(false);
......@@ -263,11 +262,11 @@ public class FailoverGatewayFilterFactory extends AbstractGatewayFilterFactory<F
ServerHttpRequest request = exchange.getRequest();
String fullUrl = baseUrl + (baseUrl.endsWith("/") ? uri.substring(1) : uri);
log.info("request id:{} Starting {} request to: {}",exchange.getAttributes().get(REQUEST_ID), isSourceRequest ? "source" : "target", fullUrl);
log.info("request id:{} Starting {} request to: {}", exchange.getAttributes().get(REQUEST_ID), isSourceRequest ? "source" : "target", fullUrl);
long startTime = System.currentTimeMillis();
Integer requestTimeout = appConfig.getRequestTimeout();
Integer requestTimeout = appConfig.getRequestTimeout();
// 创建 WebClient 请求
if(!isSourceRequest){
if (!isSourceRequest) {
//第二次请求兜底增长时间
requestTimeout = requestTimeout + 50000;
}
......@@ -310,7 +309,7 @@ public class FailoverGatewayFilterFactory extends AbstractGatewayFilterFactory<F
isSourceRequest ? "Source" : "Target",
fullUrl,
duration,
signalType,exchange.getAttributes().get(REQUEST_ID));
signalType, exchange.getAttributes().get(REQUEST_ID));
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment