From 6887a385c690306a57e15b0ff3bad6138bd051c8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 16 五月 2019 17:18:45 +0800
Subject: [PATCH] change name
---
nng.go | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/nng.go b/nng.go
index 242409a..009ef8d 100644
--- a/nng.go
+++ b/nng.go
@@ -33,11 +33,10 @@
return errors.New("please init NNG first")
}
- // switch n.sock.GetProtocol().Number() {
- // case mangos.ProtoSurveyor:
- // time.Sleep(surveyorTime * 2)
- // default:
- // }
+ if surveyorTime > 0 {
+ time.Sleep(time.Duration(surveyorTime*2) * time.Second)
+ }
+
if n.raw {
msg := mangos.NewMessage(len(data))
msg.Body = data
@@ -71,11 +70,13 @@
}
}
-func nngListener(m Mode, url string, args ...interface{}) *NNG {
+func nngServer(m Mode, url string, args ...interface{}) *NNG {
rmExistedIpcName(url)
if sock, err := newSocket(protoProducer(m)); err == nil {
if err = setSocketOptions(sock, args); err != nil {
+ sock.Close()
+ sock = nil
return nil
}
if err = sock.Listen(url); err != nil {
@@ -92,10 +93,12 @@
return nil
}
-func nngDialer(m Mode, url string, args ...interface{}) *NNG {
+func nngClient(m Mode, url string, args ...interface{}) *NNG {
if sock, err := newSocket(protoConsumer(m)); err == nil {
if err = setSocketOptions(sock, args); err != nil {
+ sock.Close()
+ sock = nil
return nil
}
@@ -117,7 +120,7 @@
// maxRecvSize max recv size
var (
maxRecvSize = 33 * 1024 * 1024
- surveyorTime = time.Second / 2
+ surveyorTime = -1
)
func defualtSocketOptions() map[string]interface{} {
@@ -152,10 +155,14 @@
for _, arg := range args {
switch arg.(type) {
case int:
- surveyorTime = time.Duration(arg.(int)/2) * time.Second
+ if arg.(int) < 2 {
+ surveyorTime = 1
+ } else {
+ surveyorTime = arg.(int) / 2
+ }
default:
}
- options[mangos.OptionSurveyTime] = surveyorTime
+ options[mangos.OptionSurveyTime] = time.Duration(surveyorTime) * time.Second
}
default:
fmt.Println("no additional args")
--
Gitblit v1.8.0