From 383557064fd77c028fd71facf8ec1cf6b278d3e6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 30 八月 2019 09:39:08 +0800
Subject: [PATCH] add send msg param
---
deliver.go | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/deliver.go b/deliver.go
index e4b7ba4..9f566eb 100644
--- a/deliver.go
+++ b/deliver.go
@@ -11,6 +11,9 @@
// Recv recv data
Recv() ([]byte, error)
+ // Recv2 recv to param
+ Recv2([]byte) (int, error)
+
// Close close Deliver
Close()
}
@@ -50,7 +53,11 @@
func NewServerWithError(m Mode, url string, args ...interface{}) (Deliver, error) {
if m > ModeStart && m < ModeNNG {
- return nngServer(m, url, args...), nil
+ s := nngServer(m, url, args...)
+ if s == nil {
+ return nil, errors.New("nng create server error")
+ }
+ return s, nil
} else if m == Shm {
return shmServer(m, url, args...)
}
@@ -61,7 +68,43 @@
func NewClientWithError(m Mode, url string, args ...interface{}) (Deliver, error) {
if m > ModeStart && m < ModeNNG {
- return nngClient(m, url, args...), nil
+ s := nngClient(m, url, args...)
+ if s == nil {
+ return nil, errors.New("nng create client error")
+ }
+ return s, nil
+ } else if m == Shm {
+ return shmClient(m, url, args...)
+ }
+
+ return nil, errors.New("please choose a suitable deliver.mode")
+}
+
+// NewServerWithTimeout with timeout
+func NewServerWithTimeout(m Mode, url string, tm int, args ...interface{}) (Deliver, error) {
+ if m > ModeStart && m < ModeNNG {
+ setTimeOut(tm)
+ s := nngServer(m, url, args...)
+ if s == nil {
+ return nil, errors.New("nng create server error")
+ }
+ return s, nil
+ } else if m == Shm {
+ return shmServer(m, url, args...)
+ }
+ return nil, errors.New("please choose a suitable deliver.mode")
+}
+
+// NewClientWithTimeout with timeout, tm unit millisecond
+func NewClientWithTimeout(m Mode, url string, tm int, args ...interface{}) (Deliver, error) {
+ if m > ModeStart && m < ModeNNG {
+ setTimeOut(tm)
+
+ s := nngClient(m, url, args...)
+ if s == nil {
+ return nil, errors.New("nng create client error")
+ }
+ return s, nil
} else if m == Shm {
return shmClient(m, url, args...)
}
--
Gitblit v1.8.0