From d1d669670db6df941efc45c26ee4481606e76d82 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 18 九月 2020 20:03:14 +0800
Subject: [PATCH] add lTime

---
 agent.go |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/agent.go b/agent.go
index 055d1d6..5d86f4e 100644
--- a/agent.go
+++ b/agent.go
@@ -36,6 +36,7 @@
 	"basic.com/valib/serf.git/cmd/serf/command/agent"
 	//"github.com/apache/servicecomb-service-center/pkg/log"
 	"basic.com/valib/logger.git"
+	"github.com/satori/go.uuid"
 )
 
 const (
@@ -139,7 +140,7 @@
 				go func() {
 					flag, e := ExecuteSqlByGorm(sqlUe.Sql)
 					logger.Info("ev.LTime:",ev.LTime,"userEvent exec ",sqlUe.Sql,",Result:",flag,", err:",e)
-					logId := strconv.Itoa(int(ev.LTime))
+					logLT := strconv.Itoa(int(ev.LTime))
 					logT := time.Now().Format("2006-01-02 15:04:05")
 					logSql := strings.Join(sqlUe.Sql, ";")
 					logResult := "0"
@@ -150,7 +151,7 @@
 					if e != nil {
 						logErr = e.Error()
 					}
-					ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+logId+"','"+logT+"','"+logSql+"','"+sqlUe.Owner+"',"+logResult+",'"+logErr+"')"})
+					ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+sqlUe.Owner+"',"+logResult+",'"+logErr+"')"})
 				}()
 			}
 		} else if ev.Name == UserEventSyncDbTablePersonCache {
@@ -248,7 +249,7 @@
 					addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
 					sendErr := rawSendTcpMsg(addr, bytesReturn)
 
-					logId := strconv.Itoa(int(ev.LTime))
+					logLT := strconv.Itoa(int(ev.LTime))
 					logT := time.Now().Format("2006-01-02 15:04:05")
 					logSql := "QueryEventUpdateDBData from "+targetNode.Name
 					logResult := "0"
@@ -262,7 +263,7 @@
 					}
 
 
-					ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+logId+"','"+logT+"','"+logSql+"','"+targetNode.Name+"',"+logResult+",'"+logErr+"')"})
+					ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+targetNode.Name+"',"+logResult+",'"+logErr+"')"})
 				}()
 			} else {
 				logger.Debug("targetNode is nil")
@@ -283,7 +284,7 @@
 				flag,e := ExecuteSqlByGorm([]string{ leaveSql })
 
 				logger.Info("EventMemberLeave,current Members:",ev.Members)
-				logId := ""
+				logLT := ""
 				logT := time.Now().Format("2006-01-02 15:04:05")
 				logSql := leaveSql
 				logResult := "0"
@@ -294,7 +295,7 @@
 				if e != nil {
 					logErr = e.Error()
 				}
-				ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+logId+"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
+				ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
 			}
 			return
 		} else if event.EventType() == serf.EventMemberJoin {
@@ -304,7 +305,7 @@
 				flag,e := ExecuteSqlByGorm([]string{joinSql})
 
 				logger.Info("EventMemberJoin,current Members:",ev.Members)
-				logId := ""
+				logLT := ""
 				logT := time.Now().Format("2006-01-02 15:04:05")
 				logSql := joinSql
 				logResult := "0"
@@ -315,7 +316,7 @@
 				if e != nil {
 					logErr = e.Error()
 				}
-				ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+logId+"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
+				ExecuteQueryByGorm([]string{"insert into sql_sync_his(`id`,`lTime`,`createTime`,`sql`,`from`,`result`,`err`) values ('"+uuid.NewV4().String()+"','"+ logLT +"','"+logT+"','"+logSql+"','"+leaveMember.Name+"',"+logResult+",'"+logErr+"')"})
 			}
 			return
 		}

--
Gitblit v1.8.0