From 64cf2678bd0d797ef43ac618ecf8aa783cb3c404 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 30 Oct 2017 23:57:21 -0400 Subject: [PATCH] removes Flux|Mono.log() calls fixes gh-93 --- .../cloud/gateway/filter/WebClientHttpRoutingFilter.java | 2 +- .../cloud/gateway/filter/WebsocketRoutingFilter.java | 8 ++++---- .../cloud/gateway/filter/ratelimit/RedisRateLimiter.java | 4 ++-- .../gateway/handler/RoutePredicateHandlerMapping.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientHttpRoutingFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientHttpRoutingFilter.java index 27f9d26e..29b68fc5 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientHttpRoutingFilter.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientHttpRoutingFilter.java @@ -84,7 +84,7 @@ public class WebClientHttpRoutingFilter implements GlobalFilter, Ordered { } return headersSpec.exchange() - .log("webClient route") + // .log("webClient route") .flatMap(res -> { ServerHttpResponse response = exchange.getResponse(); response.getHeaders().putAll(res.headers().asHttpHeaders()); diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java index b799655b..976029e1 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java @@ -99,11 +99,11 @@ public class WebsocketRoutingFilter implements GlobalFilter, Ordered { public Mono handle(WebSocketSession proxySession) { // Use retain() for Reactor Netty Mono proxySessionSend = proxySession - .send(session.receive().doOnNext(WebSocketMessage::retain)) - .log("proxySessionSend", Level.FINE); + .send(session.receive().doOnNext(WebSocketMessage::retain)); + // .log("proxySessionSend", Level.FINE); Mono serverSessionSend = session - .send(proxySession.receive().doOnNext(WebSocketMessage::retain)) - .log("sessionSend", Level.FINE); + .send(proxySession.receive().doOnNext(WebSocketMessage::retain)); + // .log("sessionSend", Level.FINE); return Mono.when(proxySessionSend, serverSessionSend).then(); } diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java index 82534c83..9852fba5 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java @@ -57,8 +57,8 @@ public class RedisRateLimiter implements RateLimiter { List args = Arrays.asList(replenishRate + "", burstCapacity + "", Instant.now().getEpochSecond() + "", "1"); // allowed, tokens_left = redis.eval(SCRIPT, keys, args) - Flux> flux = this.redisTemplate.execute(this.script, keys, args) - .log("redisratelimiter", Level.FINER); + Flux> flux = this.redisTemplate.execute(this.script, keys, args); + // .log("redisratelimiter", Level.FINER); return flux.onErrorResume(throwable -> Flux.just(Arrays.asList(1L, -1L))) .reduce(new ArrayList(), (longs, l) -> { longs.addAll(l); diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java index 6857c63b..5d76040b 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java @@ -50,7 +50,7 @@ public class RoutePredicateHandlerMapping extends AbstractHandlerMapping { exchange.getAttributes().put(GATEWAY_HANDLER_MAPPER_ATTR, getClass().getSimpleName()); return lookupRoute(exchange) - .log("route-predicate-handler-mapping", Level.FINER) //name this + // .log("route-predicate-handler-mapping", Level.FINER) //name this .flatMap((Function>) r -> { if (logger.isDebugEnabled()) { logger.debug("Mapping [" + getExchangeDesc(exchange) + "] to " + r);