From e462a5e3e6ff443e2e4972881ed7e48ae36c6eda Mon Sep 17 00:00:00 2001 From: cssxsh Date: Thu, 16 Mar 2023 13:33:43 +0800 Subject: [PATCH 1/2] fix: address as NettyChannelException message --- .../kotlin/network/impl/netty/NettyNetworkHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt index 04909eb0f43..228066de53c 100644 --- a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt +++ b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt @@ -113,7 +113,7 @@ internal open class NettyNetworkHandler( eventLoopGroup.shutdownGracefully() contextResult.cancel() }.getOrElse { error -> - throw NettyChannelException(cause = error) + throw NettyChannelException(cause = error, message = "$address") } contextResult.complete(future.channel()) From e5b8881421b29d3a222893c16da3d2a9e96550cc Mon Sep 17 00:00:00 2001 From: cssxsh Date: Thu, 16 Mar 2023 19:12:57 +0800 Subject: [PATCH 2/2] fix: message --- .../kotlin/network/impl/netty/NettyNetworkHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt index 228066de53c..17a5dd96299 100644 --- a/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt +++ b/mirai-core/src/jvmBaseMain/kotlin/network/impl/netty/NettyNetworkHandler.kt @@ -113,7 +113,7 @@ internal open class NettyNetworkHandler( eventLoopGroup.shutdownGracefully() contextResult.cancel() }.getOrElse { error -> - throw NettyChannelException(cause = error, message = "$address") + throw NettyChannelException(cause = error, message = "Failed to connect $address") } contextResult.complete(future.channel())