From 934ceaadca397448dadc3a88b57ca7ceec6046c8 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sat, 1 Jul 2023 16:09:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E6=96=87=E7=9B=B8=E5=85=B3=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-client/pom.xml | 2 +- .../neutrinoproxy/client/core/ProxyClientService.java | 9 +++++++-- neutrino-proxy-server/pom.xml | 2 +- .../server/base/proxy/ProxyConfiguration.java | 2 +- .../neutrinoproxy/server/proxy/enhance/HttpProxy.java | 2 +- .../neutrinoproxy/server/proxy/enhance/HttpsProxy.java | 4 ++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/neutrino-proxy-client/pom.xml b/neutrino-proxy-client/pom.xml index f624979f..ecb56fd1 100644 --- a/neutrino-proxy-client/pom.xml +++ b/neutrino-proxy-client/pom.xml @@ -33,7 +33,7 @@ false - app-*.yml + app-dev.yml diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java index 48b92fce..b3365549 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java @@ -78,6 +78,9 @@ public class ProxyClientService { @Override public void initChannel(SocketChannel ch) throws Exception { + if (null != proxyConfig.getClient().getTransferLogEnable() && proxyConfig.getClient().getTransferLogEnable()) { + ch.pipeline().addFirst(new LoggingHandler(RealServerChannelHandler.class)); + } ch.pipeline().addLast(new RealServerChannelHandler()); } }); @@ -92,7 +95,9 @@ public class ProxyClientService { if (proxyConfig.getClient().getSslEnable()) { ch.pipeline().addLast(createSslHandler()); } -// ch.pipeline().addFirst(new LoggingHandler(ProxyClientService.class)); + if (null != proxyConfig.getClient().getTransferLogEnable() && proxyConfig.getClient().getTransferLogEnable()) { + ch.pipeline().addFirst(new LoggingHandler(ProxyChannelHandler.class)); + } ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(), proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(), proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip())); @@ -121,7 +126,7 @@ public class ProxyClientService { ch.pipeline().addLast(createSslHandler()); } if (null != proxyConfig.getClient().getTransferLogEnable() && proxyConfig.getClient().getTransferLogEnable()) { - ch.pipeline().addFirst(new LoggingHandler(ProxyClientService.class)); + ch.pipeline().addFirst(new LoggingHandler(CmdChannelHandler.class)); } ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(), proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(), diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index 6056881b..4af63504 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -70,7 +70,7 @@ false - app-*.yml + app-dev.yml diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java index b7537641..14dd698b 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java @@ -63,7 +63,7 @@ public class ProxyConfiguration implements LifecycleBean { @Override public void initChannel(SocketChannel ch) throws Exception { if (null != proxyConfig.getServer().getTransferLogEnable() && proxyConfig.getServer().getTransferLogEnable()) { - ch.pipeline().addFirst(new LoggingHandler(ProxyTunnelServer.class)); + ch.pipeline().addFirst(new LoggingHandler(TcpVisitorChannelHandler.class)); } ch.pipeline().addFirst(new BytesMetricsHandler()); ch.pipeline().addLast(new TcpVisitorChannelHandler()); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java index 78d2c376..742be02f 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java @@ -43,7 +43,7 @@ public class HttpProxy implements EventListener { @Override public void initChannel(SocketChannel ch) throws Exception { if (null != proxyConfig.getServer().getTransferLogEnable() && proxyConfig.getServer().getTransferLogEnable()) { - ch.pipeline().addFirst(new LoggingHandler(ProxyTunnelServer.class)); + ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class)); } ch.pipeline().addFirst(new BytesMetricsHandler()); ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getDomainName())); diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java index f31b4160..a926b7c3 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java @@ -51,9 +51,9 @@ public class HttpsProxy implements EventListener { @Override public void initChannel(SocketChannel ch) throws Exception { if (null != proxyConfig.getServer().getTransferLogEnable() && proxyConfig.getServer().getTransferLogEnable()) { - ch.pipeline().addFirst(new LoggingHandler(ProxyTunnelServer.class)); + ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class)); } - ch.pipeline().addLast(createSslHandler()); +// ch.pipeline().addLast(createSslHandler()); ch.pipeline().addFirst(new BytesMetricsHandler()); ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getDomainName())); }