From 0af498fd328f89961f9358ff25215c247c8f89d3 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 21 八月 2019 15:06:22 +0800
Subject: [PATCH] update
---
deliver.go | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/deliver.go b/deliver.go
index e4b7ba4..c22dc79 100644
--- a/deliver.go
+++ b/deliver.go
@@ -50,7 +50,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 +65,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