From a735e666cff14e4e485110d2a59d401b4be61b9b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 29 八月 2019 17:50:09 +0800
Subject: [PATCH] add recover
---
util/util.go | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/util/util.go b/util/util.go
index 4c92331..875e0f7 100644
--- a/util/util.go
+++ b/util/util.go
@@ -1,17 +1,26 @@
package util
import (
- "basic.com/valib/deliver.git"
"context"
"errors"
+ "fmt"
+
+ "basic.com/valib/deliver.git"
+
// "github.com/pierrec/lz4"
"taskpubsub/logger"
)
+
+const SHMMaxTryCount = 3
type SocketContext struct {
Sock deliver.Deliver
Context context.Context
Cancel context.CancelFunc
+
+ Mode int
+ URL string
+ UseSHM bool
}
// 1. oldstring element is not in new : abandon(delete)
@@ -86,9 +95,17 @@
socket.Context = ctx
socket.Cancel = cancel
- if shm{
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- }else{
+ socket.Mode = mode
+ socket.URL = url
+ socket.UseSHM = shm
+
+ if shm {
+ var err error
+ socket.Sock, err = deliver.NewServerWithError(deliver.Mode(mode), url)
+ if err != nil {
+ fmt.Println("TASK CREATE SERVER SHM ERROR: ", err)
+ }
+ } else {
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
}
--
Gitblit v1.8.0