Merge branch 'develop' into feature/log_appender

This commit is contained in:
黄华
2021-09-14 09:41:51 +08:00
9 changed files with 89 additions and 21 deletions

View File

@@ -82,11 +82,6 @@ public class AggregateFilter implements WebFilter {
@Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
FilterResult pfr = WebUtils.getPrevFilterResult(exchange);
if (!pfr.success) {
return WebUtils.getDirectResponse(exchange);
}
String serviceId = WebUtils.getBackendService(exchange);
if (serviceId == null) {
return chain.filter(exchange);
@@ -106,6 +101,11 @@ public class AggregateFilter implements WebFilter {
}
}
FilterResult pfr = WebUtils.getPrevFilterResult(exchange);
if (!pfr.success) {
return WebUtils.getDirectResponse(exchange);
}
long start = System.currentTimeMillis();
ServerHttpRequest request = exchange.getRequest();
ServerHttpResponse serverHttpResponse = exchange.getResponse();

View File

@@ -96,7 +96,7 @@ public class FilterExceptionHandlerConfig {
}
}
Mono<Void> vm;
Object fc = exchange.getAttributes().get(WebUtils.FILTER_CONTEXT);
Object fc = exchange.getAttribute(WebUtils.FILTER_CONTEXT);
if (fc == null) { // t came from flow control filter
StringBuilder b = ThreadContext.getStringBuilder();
WebUtils.request2stringBuilder(exchange, b);

View File

@@ -84,4 +84,11 @@ public final class FizzPluginFilterChain {
return chain.filter(exchange);
}
}
public static Mono<Void> next(ServerWebExchange exchange, List<PluginConfig> pcs) {
Iterator<PluginConfig> it = pcs.iterator();
Map<String, Object> attris = exchange.getAttributes();
attris.put(pluginConfigsIt, it);
return next(exchange);
}
}