Skip to content

Commit b60422c

Browse files
committed
调整打印格式,调整获取startSate位置
1 parent 86467f6 commit b60422c

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public void run0() {
108108
if(waitTask.getState()== TaskState.connectionError.getCode()){
109109
//本地执行失败.
110110
executeConnectionError = 1;
111+
112+
lastState = 0;
111113
}
112114
}
113115

tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/AbstractTransactionThread.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ public void run0() {
2727
try {
2828
transaction();
2929
} catch (Exception e) {
30+
logger.error(e.getMessage());
3031
try {
3132
rollbackConnection();
3233
} catch (SQLException e1) {
33-
e1.printStackTrace();
34+
logger.error(e1.getMessage());
3435
}
3536
} finally {
3637
try {
3738
closeConnection();
3839
} catch (SQLException e) {
39-
e.printStackTrace();
40+
logger.error(e.getMessage());
4041
}
4142
}
4243
}

tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNStartConnection.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public class LCNStartConnection extends AbstractTransactionThread implements LCN
3535

3636
private boolean isCompensate = false;
3737

38+
private int startState = 0;
39+
3840
private ThreadLocal<Boolean> isClose = new ThreadLocal<>();
3941

4042

@@ -53,6 +55,8 @@ public LCNStartConnection(Connection connection, ICallClose<ILCNResource> subNow
5355

5456
TaskGroup taskGroup = TaskGroupManager.getInstance().createTask(groupId,txCompensateLocal.getType());
5557
waitTask = taskGroup.getCurrent();
58+
59+
startState = txCompensateLocal.getStartState();
5660
}else{
5761
isCompensate = false;
5862
logger.info("transaction is start-connection.");
@@ -153,8 +157,8 @@ public void transaction()throws SQLException{
153157
if (rs == 1) {
154158
if(isCompensate) {
155159
//补偿时需要根据补偿数据决定提交还是回滚.
156-
int starState = TxCompensateLocal.current().getStartState();
157-
if(starState==1) {
160+
rs = startState;
161+
if(rs==1) {
158162
connection.commit();
159163
}else{
160164
connection.rollback();
@@ -165,7 +169,7 @@ public void transaction()throws SQLException{
165169
} else {
166170
rollbackConnection();
167171
}
168-
System.out.println(" lcn start transaction over, res -> groupId:"+getGroupId()+" and state is "+rs+", about state (1:commit 0:rollback)");
172+
System.out.println(" lcn start transaction over, res -> groupId:"+getGroupId()+" and state is "+(rs==1?"commit":"rollback"));
169173

170174
}catch (SQLException e){
171175

0 commit comments

Comments
 (0)