From 2bc5d0350ba5bb948aeaf54ecfa59f33eeb6004b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 24 七月 2019 14:25:55 +0800
Subject: [PATCH] github.com/long/taskpubsub ==> taskpubsub
---
camera/camera.go | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index d1cc7e0..65b24df 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -4,16 +4,18 @@
"errors"
"basic.com/valib/deliver.git"
+ "taskpubsub/logger"
- "github.com/long/test/sdk"
- "github.com/long/test/util"
+ "taskpubsub/sdk"
+ "taskpubsub/util"
"github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"context"
"fmt"
"sync"
- // "time"
+ //"time"
+
)
var SocketManage sync.Map
@@ -25,10 +27,10 @@
}
func Init() {
- fmt.Println("============ camera info ====================")
+ logger.Info("============ camera info ====================")
for _, cd := range util.CameraIds {
- fmt.Println(cd)
- fmt.Println()
+ logger.Info(cd)
+ logger.Info()
}
// 鎽勫儚鏈哄垵濮嬪寲
@@ -39,7 +41,7 @@
// web绔垵濮嬪寲
CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
-// go AutoDelCamera(util.Cameraflag)
+ go AutoDelCamera(util.Cameraflag)
}
// camera 鎺ュ彈鏁版嵁
@@ -49,9 +51,10 @@
socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
if err != nil {
- fmt.Println("create socket error")
+ logger.Error("create socket error")
return
}
+
go Recv(socketlisten, remote)
}
}
@@ -60,7 +63,7 @@
func AutoDelCamera(cameraflag chan bool) {
for _ = range cameraflag {
- fmt.Println("test autodelcameraflag")
+ logger.Info("test autodelcameraflag")
var oldcamera []string
SocketManage.Range(func(k, v interface{}) bool {
@@ -71,14 +74,20 @@
})
var newcamera []string
- newcamera = append(newcamera, util.Sdklist...)
+
+ for _, camnew := range util.CameraIds {
+ newcamera = append(newcamera, camnew.Id)
+ }
+ newcamera = append(newcamera, "virtual-faceextract-sdk-pull_2")
+
cameraChanDel := util.Difference(oldcamera, newcamera)
- fmt.Println(cameraChanDel)
+ logger.Info(cameraChanDel)
for key, op := range cameraChanDel {
if op == "add" {
CreateCamera(key, "camera")
+ logger.Info("add new camera id=========================", key)
} else {
if sock, ok := SocketManage.Load(key); ok {
if socket, sok := sock.(SocketContext); sok {
@@ -86,7 +95,7 @@
SocketManage.Delete(key)
}
}
- fmt.Println("鍒犻櫎camera server : ", key)
+ logger.Info("鍒犻櫎camera server : ", key)
}
}
}
@@ -100,7 +109,7 @@
socket.Cancel = cancel
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println("new socket.Sock: ", socket.Sock)
+ logger.Info("new socket.Sock: ", socket.Sock)
if socket.Sock == nil {
return socket, errors.New("create listen error")
@@ -117,35 +126,34 @@
for {
select {
case <-socket.Context.Done():
- fmt.Println("listen recv quit")
+ logger.Error("listen recv quit")
return
default:
if recvmessage, err = socket.Sock.Recv(); err != nil {
- fmt.Println("err is: ", err)
+ //logger.Error("[camera] err is: ", err)
continue
}
unmsg, err := util.UnCompress(recvmessage)
if err != nil {
- fmt.Println(err)
+ logger.Error(err)
continue
}
if err := proto.Unmarshal(unmsg,&imagemsg); err != nil {
- fmt.Println("recv msg is not protomsgImage")
+ logger.Error("recv msg is not protomsgImage")
continue
}
- fmt.Println("============== one msg input ==========")
switch remote {
case "camera":
for _, taskid := range GetAlltask(imagemsg.Cid) {
- // time.Sleep(5 * time.Second)
- fmt.Println("id: ", imagemsg.Cid, " taskid: ", taskid)
+ //time.Sleep(5 * time.Second)
+ logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskid)
Taskdolist(imagemsg.Cid, "", taskid, recvmessage)
}
case "web":
- fmt.Println("id: ", imagemsg.Cid , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
+ logger.Debug("id: ", imagemsg.Cid , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
Taskdolist(imagemsg.Cid,"", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmessage)
}
}
@@ -168,19 +176,20 @@
func Taskdolist(cid string, caddr string, taskid string, data []byte) {
// 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ logger.Debug("taskid: ",taskid, "has ", len(data), "data[]byte")
sdkmsg := sdk.SdkData(cid, caddr, taskid, data)
if sdkmsg.Tasklab == nil {
- fmt.Printf("cid:%s 娌℃湁浠诲姟%s\n", cid, taskid)
+ logger.Error(cid, " not have taskid: ", taskid )
return
}
// 璁＄畻鍒嗗彂鐨勪富棰�
SendTopic := sdk.SdkSendTopic(sdkmsg)
- fmt.Println(SendTopic)
+ logger.Debug(SendTopic)
if _, ok := sdk.SdkMap[SendTopic]; ok {
sdk.SdkMap[SendTopic] <- sdkmsg
- fmt.Println("dispute sendtopic success", SendTopic)
+ logger.Debug("dispute sendtopic success", SendTopic)
} else {
- fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ logger.Debug("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
}
--
Gitblit v1.8.0