From 88eba9c74943c20ed15f31d1adea1a1cc9521e4d Mon Sep 17 00:00:00 2001 From: pizihao <2335715300@qq.com> Date: Mon, 14 Nov 2022 18:06:43 +0800 Subject: [PATCH] fix : Change the log level to debug --- .../cn/hippo4j/rpc/client/NettyClientConnection.java | 9 +++++++-- .../hippo4j/rpc/handler/NettyClientPoolHandler.java | 8 +++++--- .../hippo4j/rpc/handler/NettyServerTakeHandler.java | 10 +++++----- .../cn/hippo4j/rpc/process/ActiveProcessChain.java | 4 +++- .../cn/hippo4j/rpc/server/NettyServerConnection.java | 12 ++++++++---- .../cn/hippo4j/rpc/support/NettyConnectPool.java | 4 +++- 6 files changed, 31 insertions(+), 16 deletions(-) diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java index 0c9e8e66..293002d6 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/client/NettyClientConnection.java @@ -73,11 +73,14 @@ public class NettyClientConnection implements ClientConnection { public Response connect(Request request) { activeProcessChain.applyPreHandle(request); this.channel = connectionPool.acquire(timeout); + boolean debugEnabled = log.isDebugEnabled(); Response response = null; try { String key = request.getKey(); this.future = channel.writeAndFlush(request); - log.info("Call successful, target address is {}:{}, request key is {}", address.getHostName(), address.getPort(), key); + if (debugEnabled) { + log.debug("Call successful, target address is {}:{}, request key is {}", address.getHostName(), address.getPort(), key); + } // Wait for execution to complete ResultHolder.putThread(key, Thread.currentThread()); LockSupport.parkNanos(timeout() * 1000000); @@ -86,7 +89,9 @@ public class NettyClientConnection implements ClientConnection { throw new TimeOutException("Timeout waiting for server-side response"); } activeProcessChain.applyPostHandle(request, response); - log.info("The response from {}:{} was received successfully with the response key {}.", address.getHostName(), address.getPort(), key); + if (debugEnabled) { + log.debug("The response from {}:{} was received successfully with the response key {}.", address.getHostName(), address.getPort(), key); + } return response; } catch (Exception ex) { activeProcessChain.afterCompletion(request, response, ex); diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java index eced889a..3b0b7753 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyClientPoolHandler.java @@ -17,7 +17,6 @@ package cn.hippo4j.rpc.handler; -import cn.hippo4j.rpc.coder.NettyDecoder; import cn.hippo4j.rpc.coder.NettyEncoder; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; @@ -26,6 +25,7 @@ import io.netty.channel.ChannelPipeline; import io.netty.channel.pool.ChannelPoolHandler; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.serialization.ClassResolvers; +import io.netty.handler.codec.serialization.ObjectDecoder; import lombok.extern.slf4j.Slf4j; import java.util.List; @@ -75,7 +75,9 @@ public class NettyClientPoolHandler extends AbstractNettyHandlerManager implemen @Override public void channelReleased(Channel ch) { ch.writeAndFlush(Unpooled.EMPTY_BUFFER); - log.info("The connection buffer has been emptied of data"); + if (log.isDebugEnabled()) { + log.debug("The connection buffer has been emptied of data"); + } } @Override @@ -90,7 +92,7 @@ public class NettyClientPoolHandler extends AbstractNettyHandlerManager implemen .setTcpNoDelay(false); ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast(new NettyEncoder()); - pipeline.addLast(new NettyDecoder(ClassResolvers.cacheDisabled(null))); + pipeline.addLast(new ObjectDecoder(Integer.MAX_VALUE, ClassResolvers.cacheDisabled(null))); this.handlerEntities.stream() .sorted() .forEach(h -> { diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java index a4eaddc2..936f136f 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/NettyServerTakeHandler.java @@ -19,13 +19,13 @@ package cn.hippo4j.rpc.handler; import cn.hippo4j.common.toolkit.Assert; import cn.hippo4j.common.toolkit.ReflectUtil; -import cn.hippo4j.rpc.process.ActivePostProcess; -import cn.hippo4j.rpc.process.ActiveProcessChain; -import cn.hippo4j.rpc.model.Request; -import cn.hippo4j.rpc.model.DefaultResponse; -import cn.hippo4j.rpc.model.Response; import cn.hippo4j.rpc.discovery.ClassRegistry; import cn.hippo4j.rpc.discovery.Instance; +import cn.hippo4j.rpc.model.DefaultResponse; +import cn.hippo4j.rpc.model.Request; +import cn.hippo4j.rpc.model.Response; +import cn.hippo4j.rpc.process.ActivePostProcess; +import cn.hippo4j.rpc.process.ActiveProcessChain; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/process/ActiveProcessChain.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/process/ActiveProcessChain.java index 4882dc74..cb59491e 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/process/ActiveProcessChain.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/process/ActiveProcessChain.java @@ -94,7 +94,9 @@ public final class ActiveProcessChain { try { handle.afterCompletion(request, response, ex); } catch (Throwable e) { - log.error("HandlerInterceptor.afterCompletion threw exception", e); + if (log.isErrorEnabled()) { + log.error("HandlerInterceptor.afterCompletion threw exception", e); + } } } } diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java index 62bf0551..8a30d055 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/server/NettyServerConnection.java @@ -18,7 +18,6 @@ package cn.hippo4j.rpc.server; import cn.hippo4j.common.toolkit.Assert; -import cn.hippo4j.rpc.coder.NettyDecoder; import cn.hippo4j.rpc.coder.NettyEncoder; import cn.hippo4j.rpc.discovery.ServerPort; import cn.hippo4j.rpc.exception.ConnectionException; @@ -29,6 +28,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.codec.serialization.ClassResolvers; +import io.netty.handler.codec.serialization.ObjectDecoder; import lombok.extern.slf4j.Slf4j; import java.util.Arrays; @@ -80,7 +80,7 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement protected void initChannel(SocketChannel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast(new NettyEncoder()); - pipeline.addLast(new NettyDecoder(ClassResolvers.cacheDisabled(null))); + pipeline.addLast(new ObjectDecoder(Integer.MAX_VALUE, ClassResolvers.cacheDisabled(null))); handlerEntities.stream() .sorted() .forEach(h -> { @@ -95,7 +95,9 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement try { this.future = server.bind(port.getPort()).sync(); this.channel = this.future.channel(); - log.info("The server is started and can receive requests. The listening port is {}", port.getPort()); + if (log.isDebugEnabled()) { + log.debug("The server is started and can receive requests. The listening port is {}", port.getPort()); + } this.port = port; this.future.channel().closeFuture().sync(); } catch (InterruptedException ex) { @@ -112,7 +114,9 @@ public class NettyServerConnection extends AbstractNettyHandlerManager implement leader.shutdownGracefully(); worker.shutdownGracefully(); this.future.channel().close(); - log.info("The server is shut down and no more requests are received. The release port is {}", port.getPort()); + if (log.isDebugEnabled()) { + log.debug("The server is shut down and no more requests are received. The release port is {}", port.getPort()); + } } @Override diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java index 670520d4..b1b13951 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/support/NettyConnectPool.java @@ -58,7 +58,9 @@ public class NettyConnectPool { this.handler = handler; this.pool = new FixedChannelPool(bootstrap, handler, healthCheck, acquireTimeoutAction, timeout, maxConnect, maxPendingAcquires, true, true); - log.info("The connection pool is established with the connection target {}:{}", address.getHostName(), address.getPort()); + if (log.isDebugEnabled()) { + log.info("The connection pool is established with the connection target {}:{}", address.getHostName(), address.getPort()); + } NettyConnectPoolHolder.createPool(address, this); }