Merge remote-tracking branch 'funkye/0902' into 0902

apache · Oct 9, 2024 · 2d5521b · 2d5521b
2 parents 10ae72a + e65fcd7
commit 2d5521b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -19,6 +19,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6892](https://github.com/apache/incubator-seata/pull/6892)] upgrade npmjs version
 - [[#6889](https://github.com/apache/incubator-seata/pull/6889)] Correct word spelling errors
 - [[#6898](https://github.com/apache/incubator-seata/pull/6898)] upgrade npmjs version in saga module
+- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] fix log argument mismatch issue
 - [[#6902](https://github.com/apache/incubator-seata/pull/6900)] optimize readme docs
 - [[#6807](https://github.com/apache/incubator-seata/pull/6807)] splitting MergedWarpMessage enhances the server parallel processing capability
 
@@ -39,8 +40,10 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [dk2k](https://github.com/dk2k)
 - [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
 - [yougecn](https://github.com/yougecn)
+- [arrrnold17](https://github.com/arrrnold17)
 - [xjlgod](https://github.com/xjlgod)
 - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
 
 
+
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -18,10 +18,13 @@
 - [[#6883](https://github.com/apache/incubator-seata/pull/6874)] 删除代码中无用对象的创建
 - [[#6892](https://github.com/apache/incubator-seata/pull/6892)] 升级 npmjs 版本
 - [[#6889](https://github.com/apache/incubator-seata/pull/6889)] 修正单词拼写错误
+- [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本
+- [[#6879](https://github.com/apache/incubator-seata/pull/6879)] 修复日志参数不匹配问题
 - [[#6898](https://github.com/apache/incubator-seata/pull/6898)] 升级 saga 模块 npmjs 版本 
 - [[#6902](https://github.com/apache/incubator-seata/pull/6900)] 优化 readme 文档
 - [[#6807](https://github.com/apache/incubator-seata/pull/6807)] 分离merge消息使其能完全并行处理
 
+
 ### refactor:
 
 
@@ -39,6 +42,7 @@
 - [dk2k](https://github.com/dk2k)
 - [MaoMaoandSnail](https://github.com/MaoMaoandSnail)
 - [yougecn](https://github.com/yougecn)
+- [arrrnold17](https://github.com/arrrnold17)
 - [xjlgod](https://github.com/xjlgod)
 - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
 

diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/NettyClientChannelManager.java b/core/src/main/java/org/apache/seata/core/rpc/netty/NettyClientChannelManager.java
@@ -243,7 +243,7 @@ void doReconnect(List<String> availList, String transactionServiceGroup) {
                             failedMap.values().stream().map(Throwable::getMessage).collect(Collectors.toSet()));
                 } else if (LOGGER.isDebugEnabled()) {
                     failedMap.forEach((key, value) -> {
-                        LOGGER.error("{} can not connect to {} cause:{} trace information:{}",
+                        LOGGER.error("{} can not connect to {} cause:{} trace information:",
                                 FrameworkErrorCode.NetConnect.getErrCode(), key, value.getMessage(), value);
                     });
                 }