Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: optimize log in ConnectionProxyXA #5885

Merged
merged 2 commits into from Sep 28, 2023
Merged

optimize: optimize log in ConnectionProxyXA #5885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdee502
optimize: optimize log in ConnectionProxyXA
capthua Sep 26, 2023
e7d9160
add changelog
capthua Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.0.0.md
View file
Open in desktop
Expand Up @@ -120,6 +120,7 @@ The version is updated as follows:
- [[#5524](https://github.com/seata/seata/pull/5524)] support for more operational commands in seata-server.sh
- [[#5836](https://github.com/seata/seata/pull/5836)] separate MySQL from Mariadb implementations
- [[#5869](https://github.com/seata/seata/pull/5869)] some minor syntax optimization
- [[#5885](https://github.com/seata/seata/pull/5885)] optimize log in ConnectionProxyXA

### security:
- [[#5642](https://github.com/seata/seata/pull/5642)] add Hessian Serializer WhiteDenyList
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.0.0.md
View file
Open in desktop
Expand Up @@ -120,6 +120,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
- [[#5524](https://github.com/seata/seata/pull/5524)] 支持 seata-server.sh 中的更多操作命令
- [[#5836](https://github.com/seata/seata/pull/5836)] 分离mariadb和mysql的AT实现
- [[#5869](https://github.com/seata/seata/pull/5869)] 优化一些小的语法
- [[#5885](https://github.com/seata/seata/pull/5885)] 优化ConnectionProxyXA中的日志


### security:
Expand Down
6 changes: 3 additions & 3 deletions rm-datasource/src/main/java/io/seata/rm/datasource/xa/ConnectionProxyXA.java
View file
Open in desktop
Expand Up @@ -239,7 +239,7 @@ public void rollback() throws SQLException {
}
// Branch Report to TC
reportStatusToTC(BranchStatus.PhaseOne_Failed);
LOGGER.info(xaBranchXid + " was rollbacked");
LOGGER.info("{} was rollbacked", xaBranchXid);
} catch (XAException xe) {
throw new SQLException("Failed to end(TMFAIL) xa branch on " + xid + "-" + xaBranchXid.getBranchId()
+ " since " + xe.getMessage(), xe);
Expand Down Expand Up @@ -360,8 +360,8 @@ private void reportStatusToTC(BranchStatus status) {
DefaultResourceManager.get().branchReport(BranchType.XA, xid, xaBranchXid.getBranchId(),
status, null);
} catch (TransactionException te) {
LOGGER.warn("Failed to report XA branch " + status + " on " + xid + "-" + xaBranchXid.getBranchId()
+ " since " + te.getCode() + ":" + te.getMessage());
LOGGER.warn("Failed to report XA branch {} on {}-{} since {}:{}",
status, xid, xaBranchXid.getBranchId(), te.getCode(), te.getMessage());
}
}

Expand Down