From 3c8609a3da72cb2f3610f3f1789dafacc6c0f40f Mon Sep 17 00:00:00 2001
From: 龙赣华 <slongertian@gmail.com>
Date: 星期五, 31 五月 2019 11:13:58 +0800
Subject: [PATCH] add heartbeat
---
camera/camera.go | 191 +++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 97 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index e24cf2f..d4b3cce 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,141 +1,138 @@
package camera
import (
- "errors"
+ "errors"
- "basic.com/dbapi.git"
- "basic.com/valib/deliver.git"
- "basic.com/pubsub/protomsg.git"
+ "basic.com/dbapi.git"
+ "basic.com/valib/deliver.git"
- "github.com/long/test/sdk"
+ "github.com/long/test/sdk"
+ "github.com/long/test/util"
- "context"
- "fmt"
- "sync"
- "time"
- )
+ "context"
+ "fmt"
+ "sync"
+ "time"
+)
//var SocketManage = make(map[string]SocketContext)
var SocketManage sync.Map
var Initchannel = make(chan string)
- type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
- }
+type SocketContext struct {
+ Sock deliver.Deliver
+ Context context.Context
+ Cancel context.CancelFunc
+}
var camval dbapi.CameraApi
-//get camera with task
-var cameraTasks []protomsg.CameraAndTaskInfo
-
func Init() {
- fmt.Println("============ camera info ====================")
- ctsid := camval.FindAll()
+ fmt.Println("============ camera info ====================")
+ for _, cd := range util.CameraIds {
+ fmt.Println(cd)
+ fmt.Println()
+ }
- fmt.Println("==============camera camera with task ================")
- cameraTasks=camval.FindAllCameraAndTask()
+ go CreateCamera(Initchannel)
- go CreateCamera(Initchannel)
-
- for _, cam := range ctsid {
- Initchannel <- cam.Id
- }
+ for _, cam := range util.CameraIds {
+ Initchannel <- cam.Id
+ }
}
func CreateCamera(camera chan string) {
- for camid := range camera {
- if _, ok := SocketManage.Load(camid); !ok {
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", camid)
+ for camid := range camera {
+ if _, ok := SocketManage.Load(camid); !ok {
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", camid)
- id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
- if err != nil {
- fmt.Println("create socket error")
- continue
- }
+ id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
+ if err != nil {
+ fmt.Println("create socket error")
+ continue
+ }
- go func(cid string, sock SocketContext ){
- Recv(cid,sock)
- }(id,socketlisten)
- }
- }
+ go func(cid string, sock SocketContext) {
+ Recv(cid, sock)
+ }(id, socketlisten)
+ }
+ }
}
// create server
func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
- ctx, cancel := context.WithCancel(context.Background())
+ ctx, cancel := context.WithCancel(context.Background())
- socket.Context = ctx
- socket.Cancel = cancel
+ socket.Context = ctx
+ socket.Cancel = cancel
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println("new socket.Sock: ", socket.Sock)
+ socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
+ fmt.Println("new socket.Sock: ", socket.Sock)
- if socket.Sock == nil {
- return cameraid, socket, errors.New("create listen error")
- }
- SocketManage.Store(cameraid, socket)
- return cameraid, socket, nil
+ if socket.Sock == nil {
+ return cameraid, socket, errors.New("create listen error")
+ }
+ SocketManage.Store(cameraid, socket)
+ return cameraid, socket, nil
}
func Recv(cameraid string, socket SocketContext) {
- var msg []byte
- var err error
- for {
- select {
- case <-socket.Context.Done():
- fmt.Println("listen recv quit")
- return
- default:
- if msg, err = socket.Sock.Recv(); err != nil {
- fmt.Println("err is: ", cameraid, err)
- continue
- } else {
- fmt.Println()
- fmt.Println("============== one msg input ==========")
- fmt.Println("cameraid: ",cameraid, len(msg))
- for _, taskid := range GetAlltask(cameraid) {
- time.Sleep(5* time.Second)
- fmt.Println("cameraid: ",cameraid," taskid: ", taskid)
- Taskdolist(cameraid, taskid, msg)
- }
- }
- }
- }
+ var msg []byte
+ var err error
+ for {
+ select {
+ case <-socket.Context.Done():
+ fmt.Println("listen recv quit")
+ return
+ default:
+ if msg, err = socket.Sock.Recv(); err != nil {
+ fmt.Println("err is: ", cameraid, err)
+ continue
+ } else {
+ fmt.Println()
+ fmt.Println("============== one msg input ==========")
+ fmt.Println("cameraid: ", cameraid, len(msg))
+ for _, taskid := range GetAlltask(cameraid) {
+ time.Sleep(5 * time.Second)
+ fmt.Println("cameraid: ", cameraid, " taskid: ", taskid)
+ Taskdolist(cameraid, taskid, msg)
+ }
+ }
+ }
+ }
}
// 鏍规嵁cid 鑾峰彇 鎵�鏈夌殑浠诲姟
func GetAlltask(cid string) (tasks []string) {
- for _, camsingle := range cameraTasks {
- if cid == camsingle.Camera.Id {
- for _, tasksingle := range camsingle.Tasks {
- tasks = append(tasks, tasksingle.Taskid)
- }
- return
- }
- }
- return
+ for _, camsingle := range util.CameraTasks {
+ if cid == camsingle.Camera.Id {
+ for _, tasksingle := range camsingle.Tasks {
+ tasks = append(tasks, tasksingle.Taskid)
+ }
+ return
+ }
+ }
+ return
}
func Taskdolist(cid string, taskid string, data []byte) {
- // 鏁版嵁鍔犲伐(鎵撴爣绛�)
- sdkmsg := sdk.SdkData(cid, taskid, data)
- if sdkmsg.Tasklab == nil {
- fmt.Println("cid:%s 娌℃湁浠诲姟%s", cid, taskid)
- return
- }
+ // 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ sdkmsg := sdk.SdkData(cid, taskid, data)
+ if sdkmsg.Tasklab == nil {
+ fmt.Println("cid:%s 娌℃湁浠诲姟%s", cid, taskid)
+ return
+ }
- // 璁$畻鍒嗗彂鐨勪富棰�
- SendTopic := sdk.SdkSendTopic(sdkmsg)
- if _, ok := sdk.SdkMap[SendTopic]; ok {
- fmt.Println("鍒嗗彂鐨勪富棰樺瓨鍦�")
- sdk.SdkMap[SendTopic] <- sdkmsg
- //fmt.Println("閲嶆柊寮�濮嬪惊鐜�: ", sdk.SdkMap)
- } else {
- fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
- }
+ // 璁$畻鍒嗗彂鐨勪富棰�
+ SendTopic := sdk.SdkSendTopic(sdkmsg)
+ if _, ok := sdk.SdkMap[SendTopic]; ok {
+ fmt.Println("鍒嗗彂鐨勪富棰樺瓨鍦�")
+ sdk.SdkMap[SendTopic] <- sdkmsg
+ //fmt.Println("閲嶆柊寮�濮嬪惊鐜�: ", sdk.SdkMap)
+ } else {
+ fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ }
}
--
Gitblit v1.8.0