From 2d152f583afd602d501cc7fb05c54cc244943e70 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 17:47:44 +0800
Subject: [PATCH] logger使用valib
---
sdk/sdk.go | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 0998b97..6353513 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -9,7 +9,7 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "taskpubsub/logger"
+ "basic.com/valib/logger.git"
)
const (
@@ -53,6 +53,8 @@
// es
SdkMap["es"] = make(chan protomsg.SdkMessage)
logger.Info("create es channel: ")
+ logger.Info("SdkMap:", SdkMap)
+
go DealEsTopic()
go autoUpdateSdk(util.Sdkflag)
@@ -175,11 +177,18 @@
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)
+ }
} else {
sendTopic = "es"
}
- logger.Debug("鍒嗗彂鐨勪富棰�: ", sendTopic, "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1, "/", len(sdkmsg.Tasklab.Sdkinfos))
- return
+
+ return sendTopic
}
func Recv(socket util.SocketContext) {
@@ -201,6 +210,9 @@
repsdkmsg.Tasklab.Index++
//璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
nexttopic := GetSdkSendTopic(repsdkmsg)
+ if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
+ logger.Info("nexttopic:", nexttopic)
+ }
SdkMap[nexttopic] <- repsdkmsg
}
}
@@ -223,10 +235,14 @@
}
if err := socket.Sock.Send(data); err != nil {
- logger.Error("failed send:sdkid=", sdkid)
+ if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
+ logger.Error("failed send:sdkid=", sdkid)
+ }
continue
}
- logger.Debug(sdkid, " send success: ", len(data))
+ if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
+ logger.Info(sdkid, " send success: ", len(data))
+ }
} else {
logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
--
Gitblit v1.8.0