From 3fc4fa8f8bf65030ee0969d73f958b11d90b7daf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 17 十二月 2019 17:17:52 +0800
Subject: [PATCH] add log
---
util/util.go | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/util/util.go b/util/util.go
index 875e0f7..88a52ba 100644
--- a/util/util.go
+++ b/util/util.go
@@ -3,15 +3,23 @@
import (
"context"
"errors"
- "fmt"
"basic.com/valib/deliver.git"
- // "github.com/pierrec/lz4"
- "taskpubsub/logger"
+ "basic.com/valib/logger.git"
)
-const SHMMaxTryCount = 3
+const (
+ // 鍏变韩鍐呭瓨鍙戦��/鎺ユ敹澶辫触shmMaxTryCount娆￠噸鏂板垱寤洪�氶亾灏濊瘯
+ ShmMaxTryCount = 7
+ // 涓嶈鍏变韩鍐呭瓨/mangos鍙戦��/鎺ユ敹澶辫触鏈�澶ф鏁�,璁や负褰撳墠閫氶亾涓嶅啀浣跨敤, 鍏抽棴
+ // 鏈夐棶棰�,鎽勫儚鏈洪暱鏃堕棿鏂綉鍚庨噸杩�,浣嗘槸閫氶亾鍏抽棴
+ tooLongFailed = 300
+
+ File_Img_Id_Pre = "img_"
+ File_Video_Id_Pre = "video_"
+ File_Audio_Id_Pre = "audio_"
+)
type SocketContext struct {
Sock deliver.Deliver
@@ -89,7 +97,6 @@
// create server
func NewSocketListen(mode int, url string, shm bool) (socket SocketContext, err error) {
- logger.Info("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
@@ -103,7 +110,7 @@
var err error
socket.Sock, err = deliver.NewServerWithError(deliver.Mode(mode), url)
if err != nil {
- fmt.Println("TASK CREATE SERVER SHM ERROR: ", err)
+ logger.Info("TASK CREATE SERVER SHM ERROR: ", err)
}
} else {
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
@@ -131,3 +138,23 @@
return socket, nil
}
+
+func MaybeRestartSocket(socket SocketContext, tryCnt *int) SocketContext {
+ if socket.UseSHM {
+ if *tryCnt > ShmMaxTryCount {
+ logger.Info("SDK SEND SHM TRY :", ShmMaxTryCount, " RESTART IT")
+
+ socket.Sock.Close()
+ newSocket, err := NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ if err != nil {
+ return socket
+ }
+
+ *tryCnt = 0
+
+ return newSocket
+ }
+ }
+
+ return socket
+}
--
Gitblit v1.8.0