From 3fc4fa8f8bf65030ee0969d73f958b11d90b7daf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 17 十二月 2019 17:17:52 +0800
Subject: [PATCH] add log

---
 sdk/sdk.go       |   30 +++++++++++++++++-------------
 util/util.go     |    1 -
 camera/camera.go |    3 ++-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/camera/camera.go b/camera/camera.go
index 3532af1..351741a 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -182,7 +182,8 @@
 					if tryCount > util.ShmMaxTryCount {
 						socket.Sock.Close()
 						socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
-						logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
+						logger.Info("=========CAMERA RECV SHM ERROR=========")
+						logger.Info("CAMERA RECV FROM:", socket.URL, " ERROR ", util.ShmMaxTryCount, " TIMES SO RESTART IT")
 						tryCount = 0
 						continue
 					}
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 88c0445..5ce179e 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -155,12 +155,12 @@
 		newSdkList := util.Sdklist
 
 		// 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
-		for _, sendTopic := range innerSendTopic {
-			newSdkList = append(newSdkList, sendTopic)
-		}
-		for _, recvTopic := range innerRecvTopic {
-			newSdkList = append(newSdkList, recvTopic)
-		}
+		// for _, sendTopic := range innerSendTopic {
+		// 	newSdkList = append(newSdkList, sendTopic)
+		// }
+		// for _, recvTopic := range innerRecvTopic {
+		// 	newSdkList = append(newSdkList, recvTopic)
+		// }
 
 		sdkListUpdate := util.Difference(oldSdkList, newSdkList)
 		logger.Info(sdkListUpdate)
@@ -190,15 +190,17 @@
 	return sdkmsg
 }
 
+var logShouldUntil = 0
+
 //sdk鏁版嵁鍒嗗彂鍣�
 func GetSdkSendTopic(sdkmsg protomsg.SdkMessage) (sendTopic string) {
 	if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
 		sendTopic = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
-		if "Yolo" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
-			"FaceDetect" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
-			"FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype {
-			//if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
-			logger.Info("----------Sdktype:yitusoutu")
+
+		logShouldUntil++
+		if logShouldUntil > 68 {
+			logShouldUntil = 0
+			logger.Info("=========鍒嗗彂鐨勪富棰�=========")
 			logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
 		}
 	} else {
@@ -230,7 +232,8 @@
 					if tryCount > util.ShmMaxTryCount {
 						socket.Sock.Close()
 						socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
-						logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
+						logger.Info("=========SDK RECV SHM ERROR=========")
+						logger.Info("SDK RECV FROM:", socket.URL, " ERROR ", util.ShmMaxTryCount, " TIMES SO RESTART IT")
 						tryCount = 0
 						continue
 					}
@@ -286,7 +289,8 @@
 						if tryCount > util.ShmMaxTryCount {
 							socket.Sock.Close()
 							socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
-							logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
+							logger.Info("=========SDK SEND SHM ERROR=========")
+							logger.Info("SDK SEND TO: ", socket.URL, " ERROR ", util.ShmMaxTryCount, " TIMES SO RESTART IT")
 							tryCount = 0
 							continue
 						}
diff --git a/util/util.go b/util/util.go
index e3b8197..88a52ba 100644
--- a/util/util.go
+++ b/util/util.go
@@ -97,7 +97,6 @@
 
 // create server
 func NewSocketListen(mode int, url string, shm bool) (socket SocketContext, err error) {
-	logger.Info("url is: ", url)
 	ctx, cancel := context.WithCancel(context.Background())
 
 	socket.Context = ctx

--
Gitblit v1.8.0