From ba96922f40f82d12e9a5f4cfa4d887e78f460125 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 十二月 2019 15:23:17 +0800
Subject: [PATCH] update
---
camera/camera.go | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 5c38d6e..a542e7e 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -45,10 +45,10 @@
}
//鏂囦欢鍒濆鍖�
- for _,f := range util.FileArr {
+ for _, f := range util.FileArr {
logger.Info(f)
}
- for _,f :=range util.FileArr {
+ for _, f := range util.FileArr {
createCameraRecvServerAndListen(f.Id)
}
@@ -100,7 +100,7 @@
var oldcameras []string
for key := range SocketManage {
- if !strings.HasPrefix(key,util.File_Video_Id_Pre) && !strings.HasPrefix(key,util.File_Audio_Id_Pre) && !strings.HasPrefix(key,util.File_Img_Id_Pre){
+ if !strings.HasPrefix(key, util.File_Video_Id_Pre) && !strings.HasPrefix(key, util.File_Audio_Id_Pre) && !strings.HasPrefix(key, util.File_Img_Id_Pre) {
oldcameras = append(oldcameras, key)
}
}
@@ -136,7 +136,7 @@
var oldIds []string
for key := range SocketManage {
- if strings.HasPrefix(key,util.File_Video_Id_Pre) || strings.HasPrefix(key,util.File_Audio_Id_Pre) || strings.HasPrefix(key,util.File_Img_Id_Pre){
+ if strings.HasPrefix(key, util.File_Video_Id_Pre) || strings.HasPrefix(key, util.File_Audio_Id_Pre) || strings.HasPrefix(key, util.File_Img_Id_Pre) {
oldIds = append(oldIds, key)
}
}
@@ -169,24 +169,26 @@
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
logger.Error("listen recv quit")
return
default:
if recvmessage, err = socket.Sock.Recv(); err != nil {
- tryCount++
- socket = util.MaybeRestartSocket(socket, &tryCount)
+ // tryCount++
+ // socket = util.MaybeRestartSocket(socket, &tryCount)
- // if socket.UseSHM {
- // if tryCount > util.SHMMaxTryCount {
- // socket.Sock.Close()
- // socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
- // logger.Info("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
- // tryCount = 0
- // continue
- // }
- // tryCount++
- // }
+ if socket.UseSHM {
+ if tryCount > util.ShmMaxTryCount {
+ socket.Sock.Close()
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ logger.Info("=========CAMERA RECV SHM ERROR=========")
+ logger.Info("CAMERA RECV FROM:", socket.URL, " ERROR ", util.ShmMaxTryCount, " TIMES SO RESTART IT")
+ tryCount = 0
+ continue
+ }
+ tryCount++
+ }
continue
}
@@ -206,7 +208,7 @@
} else {
taskIDs := GetAllTaskByID(imagemsg.Cid)
for _, taskID := range taskIDs {
- logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
+ logger.Info("id: ", imagemsg.Cid, " taskid: ", taskID)
doTaskList(imagemsg.Cid, "", taskID, recvmessage)
}
}
--
Gitblit v1.8.0