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 | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index adee5ee..e8bce98 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -12,6 +12,7 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "github.com/long/test/logger"
)
const (
@@ -30,18 +31,18 @@
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: ")
+ logger.Info("create es channel: ")
SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
- fmt.Println("create virtual-faceextract-sdk-pull")
+ logger.Info("create virtual-faceextract-sdk-pull")
Createwebserver("virtual-faceextract-sdk-pull")
@@ -52,13 +53,13 @@
func CreatesdkTopicandServer(sdkid string) {
SdkMap[sdkid] = make(chan protomsg.SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
+ logger.Info("create sdk channel: ", sdkid)
url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create server error!")
+ logger.Error(sdkid, "create server error!")
return
}
@@ -69,7 +70,7 @@
socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create dial error!")
+ logger.Error(sdkid, "create dial error!")
return
}
go Recv(socketdial)
@@ -81,7 +82,7 @@
url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
if err != nil {
- fmt.Println(webid, "create server error!")
+ logger.Error(webid, "create server error!")
return
}
go Send(webid, socketser, SdkMap[webid])
@@ -90,11 +91,11 @@
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 涓婚鐨勬儏鍐�
@@ -102,7 +103,7 @@
for {
select {
case <-SdkMap["es"]:
- fmt.Println("es finanl sdk!")
+ //logger.Info("es finanl sdk!")
}
}
}
@@ -111,7 +112,7 @@
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)
@@ -119,20 +120,19 @@
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,caddr string, taskid string, data []byte) protomsg.SdkMessage {
@@ -148,7 +148,6 @@
sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
sdkmsg.Data = data
}
- //sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
return sdkmsg
}
@@ -159,18 +158,17 @@
} else {
sdksend = "es"
}
- fmt.Printf("鍒嗗彂鐨勪富棰樻槸锛�%s 浣嶇疆 %d/%d\n ", sdksend, int(sdkmsg.Tasklab.Index)+1, len(sdkmsg.Tasklab.Sdkinfos))
+ logger.Debug("鍒嗗彂鐨勪富棰�: ", sdksend , "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1,"/", len(sdkmsg.Tasklab.Sdkinfos))
return
}
// create server
func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
- fmt.Println("url is: ", url)
+ 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 {
@@ -182,7 +180,7 @@
}
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
@@ -203,17 +201,15 @@
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))
if err != nil {
- fmt.Println("unmarshal error: ", err)
+ logger.Error("unmarshal error: ", err)
continue
}
repsdkmsg.Tasklab.Index++
@@ -226,33 +222,27 @@
}
func Send(sdkid string, socket SocketContext, in chan protomsg.SdkMessage) {
-// var v *protomsg.SdkMessage
-// var ok bool
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket is close")
+ logger.Info("socket is close")
return
case v, ok := <-in:
if ok {
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()
-
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