From 0ac4c151e08a9735d085c08ca5bcd9b50944d650 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 26 八月 2019 16:41:35 +0800
Subject: [PATCH] memleak

---
 deliver.go |   92 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/deliver.go b/deliver.go
index 87effb0..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 {
 
@@ -8,23 +10,101 @@
 
 	// Recv recv data
 	Recv() ([]byte, error)
+
+	// Close close Deliver
+	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