From 9389544d4cc56ef00084e8dbb6afb73e1ec00eca Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 17:30:43 +0800
Subject: [PATCH] 改成使用valib的logger，增加一些日志输出
---
sdk/sdk.go | 353 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 190 insertions(+), 163 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index fd91af0..cef11e4 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -1,225 +1,252 @@
package sdk
import (
- "context"
- "encoding/json"
"fmt"
- "github.com/long/test/httpclient"
- "github.com/long/test/tasktag"
- "github.com/long/test/util"
- "time"
- "nanomsg.org/go-mangos"
- "nanomsg.org/go-mangos/protocol/pair"
- "nanomsg.org/go-mangos/transport/ipc"
- "nanomsg.org/go-mangos/transport/tcp"
+ "github.com/gogo/protobuf/proto"
+ "taskpubsub/tasktag"
+ "taskpubsub/util"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "taskpubsub/logger"
)
-var SocketManage = make(map[string]SocketContext)
+const (
+ postPush = "_1.ipc"
+ postPull = "_2.ipc"
+)
-type SocketContext struct {
- Sock mangos.Socket
- Context context.Context
- Cancel context.CancelFunc
+var SocketManage = make(map[string]util.SocketContext)
+var SdkMap = make(map[string]chan protomsg.SdkMessage)
+
+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() {
- sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
- fmt.Println("sdk list have: ", sdklist)
-
- SdkCreateTopic(sdklist) // 鍒涘缓涓婚
-
- for _, sdkid := range sdklist { // 鍒涘缓sdk server
- sdkid, socket, err := NewSdkListen(sdkid, "tcp", "192.168.1.124", 0)
- if err != nil {
- continue
- }
- // 鎺ュ彈绠￠亾鏁版嵁 ==銆� 鍙戦�佺粰 瀵瑰簲鐨勮繘绋�
- go send(sdkid, socket, SdkMap[sdkid])
-
- //浠庡搴旇繘绋嬫帴鍙楁暟鎹� == 銆� 閲嶆柊閫佸洖鍒扮閬�
- go Recv(socket)
-
+ logger.Info("============= init sdk info =====================")
+ for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
+ createSdkTopicAndServer(sdkid)
+ logger.Info()
}
- go es(SdkMap["es"])
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
+ // es
+ SdkMap["es"] = make(chan protomsg.SdkMessage)
+ logger.Info("create es channel: ")
+ logger.Info("SdkMap:", SdkMap)
+
+ go DealEsTopic()
+
+ go autoUpdateSdk(util.Sdkflag)
+}
+
+func createSdkTopicAndServer(sdkid string) {
+ createSdkSendServerAndListen(sdkid)
+ createSdkRecvServerAndListen(sdkid)
+}
+
+func deleteSdkTopicAndServer(id string) {
+ if _, isExist := SdkMap[id]; isExist { //瀛樺湪
+ close(SdkMap[id])
+ delete(SdkMap, id)
+ logger.Info("鍒犻櫎涓婚 sdk: ", id)
+ }
+
+ if _, isExist := SocketManage[id]; isExist { //瀛樺湪
+ SocketManage[id].Cancel()
+ delete(SocketManage, id)
+ logger.Info("鍒犻櫎server sdk: ", id)
+ }
+}
+
+func createSdkSendServerAndListen(id string) {
+ if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
+ SdkMap[id] = make(chan protomsg.SdkMessage)
+ logger.Info("create", id)
+ }
+
+ url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPush)
+ socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ if err != nil {
+ delete(SdkMap, id)
+ logger.Error(id, "create socket error!")
+ return
+ }
+ SocketManage[id] = socket
+
+ go Send(id, socket, SdkMap[id])
+}
+
+func createSdkRecvServerAndListen(id string) {
+ if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
+ SdkMap[id] = make(chan protomsg.SdkMessage)
+ logger.Info("create", id)
+ }
+
+ url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPull)
+ socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ if err != nil {
+ delete(SdkMap, id)
+ logger.Error(id, "create socket error!")
+ return
+ }
+ SocketManage[id] = socket
+
+ go Recv(socket)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan SdkMessage) {
- for data := range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ", data)
+func DealEsTopic() {
+ for {
+ select {
+ case <-SdkMap["es"]:
+ //logger.Info("es finanl sdk!")
+ }
}
-
}
//鍔ㄦ�佸鐞�
-func AutoDelSdk(Newsdklist []string) {
- var oldSdk []string
- for key, _ := range SdkMap {
- oldSdk = append(oldSdk, key)
- }
- sdkChanDel := util.Difference(oldSdk, Newsdklist)
+func autoUpdateSdk(sdkflag chan bool) {
- for key, op := range sdkChanDel {
- if op == "add" {
- SdkMap[key] = make(chan SdkMessage)
- fmt.Println("鍒涘缓涓婚 sdk: ", key)
- } else {
- close(SdkMap[key])
- delete(SdkMap, key)
- fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ for _ = range sdkflag {
+ logger.Info("test autodelsdk")
+ var oldSdkList []string
+ for key := range SdkMap {
+ oldSdkList = append(oldSdkList, key)
+ }
+
+ 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)
+
+ for key, op := range sdkListUpdate {
+ if op == "add" {
+ createSdkTopicAndServer(key)
+ } else {
+ deleteSdkTopicAndServer(key)
+ }
}
}
-}
-
-//涓婚
-var SdkMap = make(map[string]chan SdkMessage)
-
-// 鍙戦�佺粰绠楁硶杩涚▼鐨勭粨鏋�
-type SdkMessage struct {
- Cid string
- Tasklab tasktag.TaskLabel
- Data []byte
}
//sdk鏁版嵁 鍔犲伐鍣�
-func SdkData(cid string, taskid string, data []byte) (sdkmsg SdkMessage) {
+func ToSdkMsg(cid string, caddr string, taskid string, data []byte) protomsg.SdkMessage {
+ var sdkmsg = protomsg.SdkMessage{}
sdkmsg.Cid = cid
- sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
- sdkmsg.Data = data
- return
+ sdkmsg.Caddr = caddr
+ if val, ok := tasktag.TaskLabelMap.Load(taskid); !ok {
+ sdkmsg.Tasklab = nil
+ return sdkmsg
+ } else {
+ sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
+ sdkmsg.Data = data
+ }
+ return sdkmsg
}
//sdk鏁版嵁鍒嗗彂鍣�
-func SdkSendTopic(sdkmsg SdkMessage) (sdksend string) {
- if sdkmsg.Tasklab.Index < len(sdkmsg.Tasklab.Sdkids) {
- sdksend = sdkmsg.Tasklab.Sdkids[sdkmsg.Tasklab.Index]
- } else {
- sdksend = "es"
- }
- fmt.Println()
- fmt.Println("鍒嗗彂鐨勪富棰樻槸锛� ", sdksend)
- fmt.Println()
- return
-}
-
-// 璋冪敤 http 鍊熷彛鑾峰彇鎽勫儚鏈轰俊鎭�
-func SdkAll() (sdklist []string) {
- sdklist = httpclient.GetSdk("http://127.0.0.1:8000/data/api-v/sdk/findskdid")
- return
-}
-
-// 鍒涘缓涓婚
-func SdkCreateTopic(sdklist []string) (err error) {
- for _, sdkid := range sdklist {
- SdkMap[sdkid] = make(chan SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
- }
-
- SdkMap["es"] = make(chan SdkMessage)
- fmt.Println("create es channel: ")
-
- return nil
-}
-
-var UrlPort = 9000
-
-// 鍒涘缓 sdk server listen
-func NewSdkListen(sdkid string, protocol string, ip string, port int) (sid string, socket SocketContext, err error) {
-
- ctx, cancel := context.WithCancel(context.Background())
-
- var url string
-
- socket.Context = ctx
- socket.Cancel = cancel
-
- switch protocol {
- case "tcp":
- if port == 0 {
- port = UrlPort
- UrlPort++
+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)
}
- url = fmt.Sprintf("%s://%s:%d", protocol, ip, port)
-
- case "ipc":
- url = fmt.Sprintf("%s://%s", sdkid)
- }
- fmt.Printf("sdkid= %s url=%s\n", sdkid, url)
-
- if socket.Sock, err = pair.NewSocket(); err != nil {
- fmt.Println(sdkid, "can't get new pair socket: ", err.Error())
- return sdkid, socket, err
+ } else {
+ sendTopic = "es"
}
- socket.Sock.SetOption(mangos.OptionMaxRecvSize, 32*1024*1024)
- socket.Sock.SetOption(mangos.OptionWriteQLen, 10)
- socket.Sock.SetOption(mangos.OptionReadQLen, 10)
-
- socket.Sock.AddTransport(tcp.NewTransport())
- socket.Sock.AddTransport(ipc.NewTransport())
-
- if err = socket.Sock.Listen(url); err != nil {
- fmt.Println("socket lisnte error ", sdkid)
- }
- SocketManage[sdkid] = socket
- return sdkid, socket, err
+ return sendTopic
}
-func Recv(socket SocketContext) {
- socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
+func Recv(socket util.SocketContext) {
+ var repsdkmsg = protomsg.SdkMessage{}
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket close")
+ logger.Info("socket close")
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
- //fmt.Printf("%s ", err)
continue
} else {
-
- var repsdkmsg SdkMessage
- var reps interface{}
-
- err = json.Unmarshal(msg, &reps)
+ err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
+ logger.Error("unmarshal error: ", err)
continue
}
-
- switch v := reps.(type) {
- case map[string]interface{}:
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
-
- json.Unmarshal(msg, &repsdkmsg)
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
- case string:
- fmt.Println("this string is: ", v)
+ repsdkmsg.Tasklab.Index++
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := GetSdkSendTopic(repsdkmsg)
+ if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
+ logger.Info("nexttopic:", nexttopic)
}
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
}
-func send(sdkid string, socket SocketContext, in chan SdkMessage) {
- var v SdkMessage
- var b []byte
+func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket is close")
- case v = <-in:
- b, _ = json.Marshal(v)
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(v.Data))
- if err := socket.Sock.Send(b); err != nil {
- fmt.Println("failed send")
+ logger.Info("socket is close")
+ return
+ case v, ok := <-in:
+ if ok {
+ data, err := v.Marshal()
+ if err != nil {
+ logger.Error("proto marshal error ", err)
+ continue
+ }
+
+ 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)
+ }
+ continue
+ }
+ if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
+ logger.Info(sdkid, " send success: ", len(data))
+ }
+ } else {
+ logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
+ return
}
- fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(v.Data))
}
}
}
--
Gitblit v1.8.0