From a45d5a83c5a283444a407d648432e9dd08f89478 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 20:34:16 +0800
Subject: [PATCH] 增加配置文件处理参数
---
util/util.go | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/util/util.go b/util/util.go
index 4c92331..b8fbcea 100644
--- a/util/util.go
+++ b/util/util.go
@@ -4,14 +4,20 @@
"basic.com/valib/deliver.git"
"context"
"errors"
- // "github.com/pierrec/lz4"
- "taskpubsub/logger"
+
+ "basic.com/valib/logger.git"
)
+
+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 +92,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 {
+ logger.Info("TASK CREATE SERVER SHM ERROR: ", err)
+ }
+ } else {
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
}
--
Gitblit v1.8.0