From 330a9e5cb636286cdb399cd305856e5f419c540f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 13 十二月 2019 17:22:33 +0800
Subject: [PATCH] remove no use code
---
sdk/sdk.go | 75 +++++++++----------------------------
1 files changed, 18 insertions(+), 57 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 88c0445..0941757 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -21,25 +21,6 @@
var shm bool = false
-var innerRecvTopic = []string{
- "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
-}
-
-var innerSendTopic = []string{
- "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
- "virtual-faceextract-sdk-pull", //to web 浠ュ浘鎼滃浘
-}
-
-func initInnerTopic() {
- // for _, sendTopic := range innerSendTopic {
- // createSdkSendServerAndListen(sendTopic)
- // }
-
- // for _, recvTopic := range innerRecvTopic {
- // createSdkRecvServerAndListen(recvTopic)
- // }
-}
-
func Init(useShm bool) {
shm = useShm
@@ -47,16 +28,7 @@
logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
createSdkTopicAndServer(sdkid)
- logger.Info()
}
-
- // 鎵嬪姩杈撳叆鐨勪富棰�
- initInnerTopic()
-
- // es
- SdkMap["es"] = make(chan protomsg.SdkMessage)
- logger.Info("create es channel: ")
- go DealEsTopic()
go autoUpdateSdk(util.Sdkflag)
}
@@ -83,7 +55,6 @@
func createSdkSendServerAndListen(id string) {
if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
SdkMap[id] = make(chan protomsg.SdkMessage)
- logger.Info("create", id)
}
url := "ipc:///tmp/" + id + postPush + ".ipc"
@@ -93,15 +64,15 @@
url = id + postPush
}
- logger.Info("SDK URL: ", url)
-
socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
delete(SdkMap, id)
logger.Error(id, "create socket error!")
return
}
+
SocketManage[id] = socket
+ logger.Info("SDK URL Send: ", url)
go Send(id, socket, SdkMap[id])
}
@@ -127,7 +98,9 @@
logger.Error(id, "create socket error!")
return
}
+
SocketManage[id] = socket
+ logger.Info("SDK URL Recv: ", url)
go Recv(socket)
}
@@ -153,14 +126,6 @@
}
newSdkList := util.Sdklist
-
- // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
- for _, sendTopic := range innerSendTopic {
- newSdkList = append(newSdkList, sendTopic)
- }
- for _, recvTopic := range innerRecvTopic {
- newSdkList = append(newSdkList, recvTopic)
- }
sdkListUpdate := util.Difference(oldSdkList, newSdkList)
logger.Info(sdkListUpdate)
@@ -194,13 +159,13 @@
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")
- logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
- }
+ // 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")
+ // logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
+ // }
} else {
sendTopic = "es"
}
@@ -230,7 +195,7 @@
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 TRY :", util.ShmMaxTryCount, " RESTART IT")
tryCount = 0
continue
}
@@ -238,6 +203,7 @@
}
continue
} else {
+
err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
logger.Error("unmarshal error: ", err)
@@ -246,10 +212,8 @@
repsdkmsg.Tasklab.Index++
//璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
nexttopic := GetSdkSendTopic(repsdkmsg)
- if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
- logger.Info("nexttopic:", nexttopic)
- }
SdkMap[nexttopic] <- repsdkmsg
+ logger.Info("recv from URL: ", socket.URL, " success: ", len(msg), " send to: ", repsdkmsg)
}
}
}
@@ -275,9 +239,6 @@
}
if err := socket.Sock.Send(data); err != nil {
- if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
- logger.Error("failed send:sdkid=", sdkid)
- }
// tryCount++
// socket = util.MaybeRestartSocket(socket, &tryCount)
@@ -286,7 +247,7 @@
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 TRY :", util.ShmMaxTryCount, " RESTART IT")
tryCount = 0
continue
}
@@ -295,9 +256,9 @@
continue
}
- if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
- logger.Info(sdkid, " send success: ", len(data))
- }
+
+ logger.Info("send to sdk id: ", sdkid, " success: ", len(data))
+
} else {
logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
--
Gitblit v1.8.0