Merge branch 'master' into rxsocks

RockyLOMO · Dec 9, 2024 · 53e8a4f · 53e8a4f
2 parents a188c1f + ee74de7
commit 53e8a4f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/rxlib/src/main/java/org/rx/net/socks/Socks5CommandRequestHandler.java b/rxlib/src/main/java/org/rx/net/socks/Socks5CommandRequestHandler.java
@@ -90,7 +90,11 @@ private void connect(Channel inbound, Socks5AddressType dstAddrType, SocksContex
                         return;
                     }
                 }
-                TraceHandler.INSTANCE.log("socks5[{}] connect {}[{}] fail", server.getConfig().getListenPort(), e.getUpstream().getDestination(), e.firstDestination, f.cause());
+                if (f.cause() instanceof io.netty.channel.ConnectTimeoutException) {
+                    log.warn("socks5[{}] connect {}[{}] fail\n{}", server.getConfig().getListenPort(), e.getUpstream().getDestination(), e.firstDestination, f.cause().getMessage());
+                } else {
+                    log.error("socks5[{}] connect {}[{}] fail", server.getConfig().getListenPort(), e.getUpstream().getDestination(), e.firstDestination, f.cause());
+                }
                 inbound.writeAndFlush(new DefaultSocks5CommandResponse(Socks5CommandStatus.FAILURE, dstAddrType)).addListener(ChannelFutureListener.CLOSE);
                 return;
             }