From d1980f96745856299a784c5f43aa2ee5fd9fe8b5 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 14:33:36 +0800
Subject: [PATCH] bug fix
---
deliver.go | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/deliver.go b/deliver.go
index 21d6ea9..c22dc79 100644
--- a/deliver.go
+++ b/deliver.go
@@ -1,5 +1,7 @@
package deliver
+import "errors"
+
// Deliver define a interface how to use mangos
type Deliver interface {
@@ -13,21 +15,96 @@
Close()
}
-// NewProducer create producer args presentive for parameter with protocal, e.g. sub topic
-func NewProducer(m Mode, url string, args ...interface{}) Deliver {
+// NewServer create listener args presentive for parameter with protocal, e.g. sub topic
+func NewServer(m Mode, url string, args ...interface{}) Deliver {
if m > ModeStart && m < ModeNNG {
- return nngProducer(m, url, args...)
+ return nngServer(m, url, args...)
+ } else if m == Shm {
+ s, err := shmServer(m, url, args...)
+ if err != nil {
+ s = nil
+ }
+ return s
}
return nil
}
-// NewConsumer create consumer args presentive for parameter with protocal, e.g. sub topic
-func NewConsumer(m Mode, url string, args ...interface{}) Deliver {
+// NewClient create dialer args presentive for parameter with protocal, e.g. sub topic
+func NewClient(m Mode, url string, args ...interface{}) Deliver {
if m > ModeStart && m < ModeNNG {
- return nngConsumer(m, url, args...)
+ return nngClient(m, url, args...)
+ } else if m == Shm {
+ s, err := shmClient(m, url, args...)
+ if err != nil {
+ s = nil
+ }
+ return s
}
return nil
}
+
+// NewServerWithError create listener args presentive for parameter with protocal, e.g. sub topic
+func NewServerWithError(m Mode, url string, args ...interface{}) (Deliver, error) {
+
+ if m > ModeStart && m < ModeNNG {
+ 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")
+}
+
+// NewClientWithError create dialer args presentive for parameter with protocal, e.g. sub topic
+func NewClientWithError(m Mode, url string, args ...interface{}) (Deliver, error) {
+
+ if m > ModeStart && m < ModeNNG {
+ 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...)
+ }
+
+ return nil, errors.New("please choose a suitable deliver.mode")
+}
--
Gitblit v1.8.0