1. 优化日志打印数据格式

xlorne · xlorne · commit d874d828ba5f · 2017-11-21T16:57:06.000+08:00
2. 去掉ILCNTransactionControl下的setDataSourceService方法
diff --git a/transaction-dubbo/pom.xml b/transaction-dubbo/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-dubbo</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>transaction-dubbo</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <dependency>
diff --git a/transaction-springcloud/pom.xml b/transaction-springcloud/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.codingapi</groupId>
 	<artifactId>transaction-springcloud</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<name>transaction-springcloud</name>
 	<url>https://github.com/codingapi/tx-lcn</url>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>com.codingapi</groupId>
 			<artifactId>tx-client</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/tx-client/pom.xml b/tx-client/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-client</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>tx-client</name>
     <url>https://github.com/codingapi/tx-lcn</url>
diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxDefaultTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxDefaultTransactionServerImpl.java
@@ -12,6 +12,7 @@
 public class TxDefaultTransactionServerImpl implements TransactionServer {
 
 
+
     @Override
     public Object execute(ProceedingJoinPoint point, TxTransactionInfo info) throws Throwable {
         return point.proceed();
diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningNoTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningNoTransactionServerImpl.java
@@ -24,7 +24,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
 
         String kid = KidUtils.generateShortUuid();
         String txGroupId = info.getTxGroupId();
-        logger.info("tx-no-running-start->" + txGroupId);
+        logger.info("--->begin no db transaction, groupId: " + txGroupId);
         long t1 = System.currentTimeMillis();
 
 
@@ -43,7 +43,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         } finally {
             TxTransactionLocal.setCurrent(null);
             long t2 = System.currentTimeMillis();
-            logger.info("tx-no-running-end->" + txGroupId+",time->"+(t2-t1));
+            logger.info("<---end no db transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));
         }
     }
 
diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxRunningTransactionServerImpl.java
@@ -41,7 +41,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
 
         String kid = KidUtils.generateShortUuid();
         String txGroupId = info.getTxGroupId();
-        logger.info("tx-running-start->" + txGroupId);
+        logger.info("--->begin running transaction,groupId:" + txGroupId);
         long t1 = System.currentTimeMillis();
 
         boolean isHasIsGroup =  transactionControl.hasGroup(txGroupId);
@@ -85,7 +85,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
                             //修改事务组状态异常
                             waitTask.setState(-1);
                             waitTask.signalTask();
-                            throw new ServiceException("修改事务组状态异常." + txGroupId);
+                            throw new ServiceException("update TxGroup error, groupId:" + txGroupId);
                         }
                     }
                 }
@@ -97,7 +97,8 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i
         } finally {
             TxTransactionLocal.setCurrent(null);
             long t2 = System.currentTimeMillis();
-            logger.info("tx-running-end->" + txGroupId+",time->"+(t2-t1));
+            logger.info("<---end running transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));
+
         }
     }
 
diff --git a/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java b/tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java
@@ -33,15 +33,16 @@ public class TxStartTransactionServerImpl implements TransactionServer {
     @Override
     public Object execute(ProceedingJoinPoint point, final TxTransactionInfo info) throws Throwable {
         //分布式事务开始执行
-        logger.info("tx-start");
+
+        logger.info("--->begin start transaction");
 
         long start = System.currentTimeMillis();
         //创建事务组
         TxGroup txGroup = txManagerService.createTransactionGroup();
 
         //获取不到模块信息重新连接，本次事务异常返回数据.
         if (txGroup == null) {
-            throw new ServiceException("创建事务组异常.");
+            throw new ServiceException("create TxGroup error");
         }
         final String groupId = txGroup.getGroupId();
         int state = 0;
@@ -78,7 +79,8 @@ public void run0() {
                 }
             }
             TxTransactionLocal.setCurrent(null);
-            logger.info("tx-end-"+txGroup.getGroupId()+">"+state);
+            logger.info("<---end start transaction");
+            logger.info("start transaction over, res -> groupId:"+txGroup.getGroupId()+",now state:"+(state==1?"commit":"rollback"));
         }
     }
 
diff --git a/tx-client/src/main/java/com/codingapi/tx/control/service/impl/ActionCServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/control/service/impl/ActionCServiceImpl.java
@@ -30,7 +30,7 @@ public String execute(JSONObject resObj, String json) {
 
         String cmd = resObj.toJSONString();
 
-        logger.info("接受补偿->" + cmd);
+        logger.info("accept compensate data ->" + cmd);
 
 
         String data = resObj.getString("d");
@@ -42,11 +42,11 @@ public String execute(JSONObject resObj, String json) {
         TransactionInvocation invocation = SerializerUtils.parserTransactionInvocation(bytes);
 
         if (invocation != null) {
-            logger.info("接受补偿->" + invocation.getMethodStr());
+            logger.info("compensate method ->" + invocation.getMethodStr());
 
             boolean res = compensateService.invoke(invocation, groupId);
 
-            logger.info("补偿结果->" + res);
+            logger.info("compensate res ->" + res);
 
             if (res) {
                 return "1";
diff --git a/tx-client/src/main/java/com/codingapi/tx/control/service/impl/ActionTServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/control/service/impl/ActionTServiceImpl.java
@@ -25,7 +25,7 @@ public String execute(JSONObject resObj, String json) {
         final int state = resObj.getInteger("c");
         String taskId = resObj.getString("t");
         TaskGroup task = TaskGroupManager.getInstance().getTaskGroup(taskId);
-        logger.info("接受通知数据->" + json);
+        logger.info("accept notify data ->" + json);
         if (task != null) {
             if (task.isAwait()) {   //已经等待
                 res = notifyWaitTask(task, state);
diff --git a/tx-client/src/main/java/com/codingapi/tx/control/service/impl/TransactionControlServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/control/service/impl/TransactionControlServiceImpl.java
@@ -28,6 +28,7 @@ public class TransactionControlServiceImpl implements TransactionControlService{
     @Override
     public void notifyTransactionMsg(ChannelHandlerContext ctx,JSONObject resObj, String json) {
 
+
         String action = resObj.getString("a");
         String key = resObj.getString("k");
 
@@ -45,6 +46,7 @@ public void notifyTransactionMsg(ChannelHandlerContext ctx,JSONObject resObj, St
         data.put("p", params);
 
         SocketUtils.sendMsg(ctx, data.toString());
-        logger.info("返回通知状态->" + data.toString());
+
+        logger.info("send notify data ->" + data.toString());
     }
 }
diff --git a/tx-client/src/main/java/com/codingapi/tx/datasource/AbstractResourceProxy.java b/tx-client/src/main/java/com/codingapi/tx/datasource/AbstractResourceProxy.java
@@ -6,6 +6,9 @@
 import com.codingapi.tx.datasource.service.DataSourceService;
 import com.lorne.core.framework.utils.task.Task;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -20,6 +23,10 @@ public abstract class AbstractResourceProxy<C,T extends ILCNResource> implements
     protected Map<String, T> pools = new ConcurrentHashMap<>();
 
 
+    private Logger logger = LoggerFactory.getLogger(AbstractResourceProxy.class);
+
+
+    @Autowired
     protected DataSourceService dataSourceService;
 
 
@@ -34,10 +41,6 @@ public boolean hasTransaction() {
         return true;
     }
 
-    @Override
-    public void setDataSourceService(DataSourceService dataSourceService) {
-        this.dataSourceService =dataSourceService;
-    }
 
     //default size
     protected volatile int maxCount = 5;
@@ -105,7 +108,7 @@ private C createConnection(TxTransactionLocal txTransactionLocal, C connection){
         } else if (nowCount < maxCount) {
             return createLcnConnection(connection, txTransactionLocal);
         } else {
-            System.out.println("connection was overload");
+            logger.info("connection was overload");
             return null;
         }
         return connection;
@@ -119,18 +122,23 @@ protected C initLCNConnection(C connection) {
 
         if (txTransactionLocal != null) {
 
+            logger.info("lcn datasource transaction control ");
+
             //只读操作，直接返回connection
             if(txTransactionLocal.isReadOnly()){
+                logger.info("readonly transaction ");
                 return connection;
             }
 
             //补偿的情况的
             if (TxCompensateLocal.current() != null) {
+                logger.info("rollback transaction ");
                 return getRollback(connection);
             }
 
             if(StringUtils.isNotEmpty(txTransactionLocal.getGroupId())){
                 if (!txTransactionLocal.isHasStart()) {
+                    logger.info("lcn transaction ");
                     return createConnection(txTransactionLocal, connection);
                 }
             }
diff --git a/tx-client/src/main/java/com/codingapi/tx/datasource/ILCNTransactionControl.java b/tx-client/src/main/java/com/codingapi/tx/datasource/ILCNTransactionControl.java
@@ -1,6 +1,5 @@
 package com.codingapi.tx.datasource;
 
-import com.codingapi.tx.datasource.service.DataSourceService;
 
 /**
  * LCN 代理事务协调控制
@@ -15,12 +14,6 @@ public interface ILCNTransactionControl {
      */
     boolean hasGroup(String group);
 
-    /**
-     * 设置数据库连接池
-     * @param dataSourceService 数据操作服务
-     */
-    void setDataSourceService(DataSourceService dataSourceService);
-
     /**
      * 是否是 事务操作
      * @return true是，false否
diff --git a/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java
@@ -1,8 +1,6 @@
 package com.codingapi.tx.listener.service.impl;
 
 import com.codingapi.tx.Constants;
-import com.codingapi.tx.datasource.ILCNTransactionControl;
-import com.codingapi.tx.datasource.service.DataSourceService;
 import com.codingapi.tx.listener.service.InitService;
 import com.codingapi.tx.listener.service.ModelNameService;
 import com.codingapi.tx.listener.service.TimeOutService;
@@ -26,11 +24,6 @@ public class InitServiceImpl implements InitService {
     @Autowired
     private TimeOutService timeOutService;
 
-    @Autowired
-    private DataSourceService dataSourceService;
-
-    @Autowired
-    private ILCNTransactionControl dataSourceProxy;
 
     @Autowired
     private ModelNameService modelNameService;
@@ -39,12 +32,6 @@ public class InitServiceImpl implements InitService {
     @Override
     public void start() {
 
-        /**
-         * 由于SQLSessionFactory等类的加载方式导致，无法通过
-         * bean自动注入的方式注入给代理对象，因此通过初始化的时候再为其赋值。
-         */
-        dataSourceProxy.setDataSourceService(dataSourceService);
-
         /**
          * 设置模块唯一标示
          */
diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/handler/TransactionHandler.java b/tx-client/src/main/java/com/codingapi/tx/netty/handler/TransactionHandler.java
@@ -29,7 +29,6 @@ public class TransactionHandler extends ChannelInboundHandlerAdapter {
 
     public TransactionHandler(NettyControlService nettyControlService, int delay) {
         this.nettyControlService = nettyControlService;
-        //this.delay = delay;
 
         SocketManager.getInstance().setDelay(delay);
 
@@ -47,9 +46,9 @@ public TransactionHandler(NettyControlService nettyControlService, int delay) {
     @Override
     public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
 
-        final String json = SocketUtils.getJson(msg);
-        logger.info("接受->" + json);
+        String json = SocketUtils.getJson(msg);
 
+        logger.info("TxManager-response->" + json);
 
         nettyControlService.executeService(ctx,json);
     }
@@ -73,7 +72,8 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         super.channelActive(ctx);
         SocketManager.getInstance().setCtx(ctx);
-        logger.info("建立链接-->" + ctx);
+
+        logger.info("try connection -->" + ctx);
 
         nettyControlService.uploadModelInfo();
     }
@@ -90,10 +90,9 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
             } else if (event.state() == IdleState.WRITER_IDLE) {
                 //表示已经多久没有发送数据了
                 SocketUtils.sendMsg(ctx, heartJson);
-                logger.info("心跳数据---" + heartJson);
+                logger.info("hart data --->" + heartJson);
             } else if (event.state() == IdleState.ALL_IDLE) {
                 //表示已经多久既没有收到也没有发送数据了
-
             }
         }
     }
diff --git a/tx-manager/src/main/resources/application.properties b/tx-manager/src/main/resources/application.properties
@@ -34,7 +34,7 @@ tm.transaction.netty.hearttime = 15
 tm.redis.savemaxtime=30
 
 #socket server Socket对外服务端口
-tm.socket.port=9999
+tm.socket.port=8898
 # 最大socket连接数
 tm.socket.maxconnection=100
 
diff --git a/tx-plugins-db/pom.xml b/tx-plugins-db/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>tx-plugins-db</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>tx-plugins-db</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
 
diff --git a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNDBConnection.java b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNDBConnection.java
diff --git a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNRollBackDBConnection.java b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNRollBackDBConnection.java
diff --git a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNTransactionDataSource.java b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNTransactionDataSource.java
diff --git a/tx-plugins-nodb/pom.xml b/tx-plugins-nodb/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i`
`24`	`24`
`25`	`25`	`String kid = KidUtils.generateShortUuid();`
`26`	`26`	`String txGroupId = info.getTxGroupId();`
`27`		`- logger.info("tx-no-running-start->" + txGroupId);`
	`27`	`+ logger.info("--->begin no db transaction, groupId: " + txGroupId);`
`28`	`28`	`long t1 = System.currentTimeMillis();`
`29`	`29`
`30`	`30`
`@@ -43,7 +43,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i`
`43`	`43`	`} finally {`
`44`	`44`	`TxTransactionLocal.setCurrent(null);`
`45`	`45`	`long t2 = System.currentTimeMillis();`
`46`		`- logger.info("tx-no-running-end->" + txGroupId+",time->"+(t2-t1));`
	`46`	`+ logger.info("<---end no db transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i`
`41`	`41`
`42`	`42`	`String kid = KidUtils.generateShortUuid();`
`43`	`43`	`String txGroupId = info.getTxGroupId();`
`44`		`- logger.info("tx-running-start->" + txGroupId);`
	`44`	`+ logger.info("--->begin running transaction,groupId:" + txGroupId);`
`45`	`45`	`long t1 = System.currentTimeMillis();`
`46`	`46`
`47`	`47`	`boolean isHasIsGroup = transactionControl.hasGroup(txGroupId);`
`@@ -85,7 +85,7 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i`
`85`	`85`	`//修改事务组状态异常`
`86`	`86`	`waitTask.setState(-1);`
`87`	`87`	`waitTask.signalTask();`
`88`		`- throw new ServiceException("修改事务组状态异常." + txGroupId);`
	`88`	`+ throw new ServiceException("update TxGroup error, groupId:" + txGroupId);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -97,7 +97,8 @@ public Object execute(final ProceedingJoinPoint point, final TxTransactionInfo i`
`97`	`97`	`} finally {`
`98`	`98`	`TxTransactionLocal.setCurrent(null);`
`99`	`99`	`long t2 = System.currentTimeMillis();`
`100`		`- logger.info("tx-running-end->" + txGroupId+",time->"+(t2-t1));`
	`100`	`+ logger.info("<---end running transaction,groupId:" + txGroupId+",execute time:"+(t2-t1));`
	`101`	`+`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,16 @@ public class TxStartTransactionServerImpl implements TransactionServer {`
`33`	`33`	`@Override`
`34`	`34`	`public Object execute(ProceedingJoinPoint point, final TxTransactionInfo info) throws Throwable {`
`35`	`35`	`//分布式事务开始执行`
`36`		`- logger.info("tx-start");`
	`36`	`+`
	`37`	`+ logger.info("--->begin start transaction");`
`37`	`38`
`38`	`39`	`long start = System.currentTimeMillis();`
`39`	`40`	`//创建事务组`
`40`	`41`	`TxGroup txGroup = txManagerService.createTransactionGroup();`
`41`	`42`
`42`	`43`	`//获取不到模块信息重新连接，本次事务异常返回数据.`
`43`	`44`	`if (txGroup == null) {`
`44`		`- throw new ServiceException("创建事务组异常.");`
	`45`	`+ throw new ServiceException("create TxGroup error");`
`45`	`46`	`}`
`46`	`47`	`final String groupId = txGroup.getGroupId();`
`47`	`48`	`int state = 0;`
`@@ -78,7 +79,8 @@ public void run0() {`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`	`TxTransactionLocal.setCurrent(null);`
`81`		`- logger.info("tx-end-"+txGroup.getGroupId()+">"+state);`
	`82`	`+ logger.info("<---end start transaction");`
	`83`	`+ logger.info("start transaction over, res -> groupId:"+txGroup.getGroupId()+",now state:"+(state==1?"commit":"rollback"));`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class TransactionControlServiceImpl implements TransactionControlService{`
`28`	`28`	`@Override`
`29`	`29`	`public void notifyTransactionMsg(ChannelHandlerContext ctx,JSONObject resObj, String json) {`
`30`	`30`
	`31`	`+`
`31`	`32`	`String action = resObj.getString("a");`
`32`	`33`	`String key = resObj.getString("k");`
`33`	`34`
`@@ -45,6 +46,7 @@ public void notifyTransactionMsg(ChannelHandlerContext ctx,JSONObject resObj, St`
`45`	`46`	`data.put("p", params);`
`46`	`47`
`47`	`48`	`SocketUtils.sendMsg(ctx, data.toString());`
`48`		`- logger.info("返回通知状态->" + data.toString());`
	`49`	`+`
	`50`	`+ logger.info("send notify data ->" + data.toString());`
`49`	`51`	`}`
`50`	`52`	`}`