From 40d864645ff608e3a81d115fef26bba87954be2c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 22 七月 2019 18:42:06 +0800
Subject: [PATCH] add log and fix pubusb
---
sdk/sdk.go | 156 +++++++++++++++++++++++++++------------------------
1 files changed, 83 insertions(+), 73 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index bd933e7..e8bce98 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -8,11 +8,11 @@
// "github.com/long/test/httpclient"
"github.com/long/test/tasktag"
"github.com/long/test/util"
-
- "github.com/golang/protobuf/proto"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "github.com/long/test/logger"
)
const (
@@ -21,7 +21,7 @@
)
var SocketManage = make(map[string]SocketContext)
-var SdkMap = make(map[string]chan *protomsg.SdkMessage)
+var SdkMap = make(map[string]chan protomsg.SdkMessage)
type SocketContext struct {
Sock deliver.Deliver
@@ -31,93 +31,114 @@
func Init() {
- fmt.Println("============= init sdk info =====================")
+ logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
CreatesdkTopicandServer(sdkid)
- fmt.Println()
+ logger.Info()
}
- SdkMap["es"] = make(chan *protomsg.SdkMessage)
- fmt.Println("create es channel: ")
- go es(SdkMap["es"])
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ SdkMap["es"] = make(chan protomsg.SdkMessage)
+ logger.Info("create es channel: ")
+
+ SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
+ logger.Info("create virtual-faceextract-sdk-pull")
+
+ Createwebserver("virtual-faceextract-sdk-pull")
+
+ go Dealextern()
go AutoDelSdk(util.Sdkflag)
}
func CreatesdkTopicandServer(sdkid string) {
- SdkMap[sdkid] = make(chan *protomsg.SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
+
+ SdkMap[sdkid] = make(chan protomsg.SdkMessage)
+ logger.Info("create sdk channel: ", sdkid)
url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
- sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create server error!")
+ delete(SdkMap, sdkid)
+ logger.Error(sdkid, "create server error!")
return
}
- go Send(sdkidser, socketser, SdkMap[sdkid])
+
+
+ go Send(sdkid, socketser, SdkMap[sdkid])
url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create dial error!")
+ delete(SdkMap, sdkid)
+ logger.Error(sdkid, "create dial error!")
return
}
go Recv(socketdial)
}
+
+// web 鎺ュ彈绔鐞�
+func Createwebserver(webid string ){
+ url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
+ if err != nil {
+ logger.Error(webid, "create server error!")
+ return
+ }
+ go Send(webid, socketser, SdkMap[webid])
+}
+
func DeletesdkTopicandServer(sdkid string) {
close(SdkMap[sdkid])
delete(SdkMap, sdkid)
- fmt.Println("鍒犻櫎涓婚 sdk: ", sdkid)
+ logger.Info("鍒犻櫎涓婚 sdk: ", sdkid)
SocketManage[sdkid].Cancel()
delete(SocketManage, sdkid)
- fmt.Println("鍒犻櫎server sdk: ", sdkid)
+ logger.Info("鍒犻櫎server sdk: ", sdkid)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan *protomsg.SdkMessage) {
- for _ = range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ")
- }
+func Dealextern() {
+ for {
+ select {
+ case <-SdkMap["es"]:
+ //logger.Info("es finanl sdk!")
+ }
+ }
}
//鍔ㄦ�佸鐞�
func AutoDelSdk(sdkflag chan bool) {
for _ = range sdkflag {
- fmt.Println("test autodelsdk")
+ logger.Info("test autodelsdk")
var oldSdk []string
for key, _ := range SdkMap {
oldSdk = append(oldSdk, key)
}
util.Sdklist = append(util.Sdklist, "es")
+ util.Sdklist = append(util.Sdklist, "virtual-faceextract-sdk-pull")
sdkChanDel := util.Difference(oldSdk, util.Sdklist)
- fmt.Println(sdkChanDel)
+ logger.Info(sdkChanDel)
for key, op := range sdkChanDel {
if op == "add" {
CreatesdkTopicandServer(key)
} else {
DeletesdkTopicandServer(key)
- fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ logger.Info("鍒犻櫎涓婚 sdk: ", key)
}
}
}
}
-//涓婚
//sdk鏁版嵁 鍔犲伐鍣�
-func SdkData(cid string, taskid string, data []byte) *protomsg.SdkMessage {
- var sdkmsg = &protomsg.SdkMessage{}
+func SdkData(cid string,caddr string, taskid string, data []byte) protomsg.SdkMessage {
+ var sdkmsg = protomsg.SdkMessage{}
sdkmsg.Cid = cid
- //if _, ok := tasktag.TaskMapLab[taskid]; !ok {
- // sdkmsg.Tasklab = nil
- // return sdkmsg
- //}
-
+ sdkmsg.Caddr =caddr
if val, ok := tasktag.TaskMapLab.Load(taskid); !ok {
sdkmsg.Tasklab = nil
return sdkmsg
@@ -127,41 +148,39 @@
sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
sdkmsg.Data = data
}
- //sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
return sdkmsg
}
//sdk鏁版嵁鍒嗗彂鍣�
-func SdkSendTopic(sdkmsg *protomsg.SdkMessage) (sdksend string) {
- if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkids) {
- sdksend = sdkmsg.Tasklab.Sdkids[sdkmsg.Tasklab.Index]
+func SdkSendTopic(sdkmsg protomsg.SdkMessage) (sdksend string) {
+ if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
+ sdksend = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
} else {
sdksend = "es"
}
- fmt.Println("鍒嗗彂鐨勪富棰樻槸锛� ", sdksend)
+ logger.Debug("鍒嗗彂鐨勪富棰�: ", sdksend , "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1,"/", len(sdkmsg.Tasklab.Sdkinfos))
return
}
// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
+func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
+ logger.Info("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
socket.Cancel = cancel
-
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage[sdkid] = socket
- return sdkid, socket, nil
+ return socket, nil
}
func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
+ logger.Info("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
@@ -178,63 +197,54 @@
}
func Recv(socket SocketContext) {
-
- var repsdkmsg = &protomsg.SdkMessage{}
+ 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 {
- err = proto.Unmarshal(msg, repsdkmsg)
- fmt.Println("receive len: ", len(msg))
+ err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
- fmt.Println("unmarshal error: ", err)
+ logger.Error("unmarshal error: ", err)
continue
- }
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
+ }
+ repsdkmsg.Tasklab.Index++
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := SdkSendTopic(repsdkmsg)
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
}
-func Send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
- var v *protomsg.SdkMessage
- var ok bool
+func Send(sdkid string, socket SocketContext, in chan protomsg.SdkMessage) {
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket is close")
+ logger.Info("socket is close")
return
- case v, ok = <-in:
+ case v, ok := <-in:
if ok {
- data, err := proto.Marshal(v)
+ data, err :=v.Marshal()
if err != nil {
- fmt.Println("proto marshal error ", err)
+ logger.Error("proto marshal error ", err)
continue
- }
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
- fmt.Println()
-
- fmt.Println("send len of data: ", len(data))
+ }
+
if err := socket.Sock.Send(data); err != nil {
- fmt.Println(socket.Sock)
- fmt.Println("failed send")
+ logger.Error("failed send")
continue
}
- fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
+ logger.Debug(sdkid, " send success: ", len(data))
} else {
- fmt.Println(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
+ logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
}
-
}
}
}
--
Gitblit v1.8.0