From c2bbe31e7c6c9f83f7bcce26dea98bc18ed8f39c Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 22 五月 2019 13:35:09 +0800
Subject: [PATCH] fix crash and add NewServerWithError return error

---
 shm.go     |   41 ++++++++++----------
 deliver.go |   31 ++++++++++++++-
 nng.go     |    9 ++++
 3 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/deliver.go b/deliver.go
index fe01778..5d8167f 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 {
 
@@ -19,7 +21,8 @@
 	if m > ModeStart && m < ModeNNG {
 		return nngServer(m, url, args...)
 	} else if m == Shm {
-		return shmServer(m, url, args...)
+		s, _ := shmServer(m, url, args...)
+		return s
 	}
 	return nil
 }
@@ -30,8 +33,32 @@
 	if m > ModeStart && m < ModeNNG {
 		return nngClient(m, url, args...)
 	} else if m == Shm {
-		return shmClient(m, url, args...)
+		s, _ := shmClient(m, url, args...)
+		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 {
+		return nngServer(m, url, args...), 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 {
+		return nngClient(m, url, args...), nil
+	} else if m == Shm {
+		return shmClient(m, url, args...)
+	}
+
+	return nil, errors.New("please choose a suitable deliver.mode")
+}
diff --git a/nng.go b/nng.go
index 751feac..fa3e409 100644
--- a/nng.go
+++ b/nng.go
@@ -33,6 +33,9 @@
 
 // Send impl interface Diliver
 func (n *NNG) Send(data []byte) error {
+	if n == nil {
+		return errors.New("please init NNG first")
+	}
 	var err error
 	if n.sock == nil {
 		n.sock, err = n.makeNNG(agent)
@@ -54,6 +57,10 @@
 
 // Recv impl interface Diliver
 func (n *NNG) Recv() ([]byte, error) {
+	if n == nil {
+		return nil, errors.New("please init NNG first")
+	}
+
 	var err error
 
 	if n.sock == nil {
@@ -74,7 +81,7 @@
 
 // Close impl interface Deliver
 func (n *NNG) Close() {
-	if n.sock != nil {
+	if n != nil && n.sock != nil {
 		n.sock.Close()
 		n.sock = nil
 	}
diff --git a/shm.go b/shm.go
index a5b6ab9..fcdc76b 100644
--- a/shm.go
+++ b/shm.go
@@ -16,7 +16,7 @@
 
 // Send impl interface Diliver
 func (s *SHM) Send(data []byte) error {
-	if s.rw == nil {
+	if s == nil || s.rw == nil {
 		return errors.New("please init shm producer first")
 	}
 
@@ -31,7 +31,7 @@
 // Recv impl interface Diliver
 func (s *SHM) Recv() ([]byte, error) {
 
-	if s.rw == nil {
+	if s == nil || s.rw == nil {
 		return nil, errors.New("please open shm consumer first")
 	}
 
@@ -47,6 +47,9 @@
 
 // Close impl interface Deliver
 func (s *SHM) Close() {
+	if s == nil {
+		return
+	}
 	if s.rw != nil {
 		s.rw.Close()
 	}
@@ -55,10 +58,9 @@
 	}
 }
 
-func shmServer(m Mode, url string, args ...interface{}) *SHM {
+func shmServer(m Mode, url string, args ...interface{}) (*SHM, error) {
 	if m != Shm {
-		fmt.Println("this is not a shm mode: ", m)
-		return nil
+		return nil, errors.New("please use deliver.Shm mode")
 	}
 
 	var param []int
@@ -68,40 +70,37 @@
 		case int:
 			param = append(param, v.(int))
 		default:
-			fmt.Println("shmProducer recv error parameters")
 
-			return nil
+			return nil, errors.New("shmServer created recv error parameters")
 		}
 	}
 	if len(param) != 2 {
-		fmt.Println("shmProducer recv too much parameter: ", len(param))
-		return nil
+		return nil, errors.New("shmServer created recv too much parameters")
 	}
-	if rw, err := shm.CreateSimplex(url, 0644, param[0], param[1]); err == nil {
+
+	rw, err := shm.CreateSimplex(url, 0644, param[0], param[1])
+	if err == nil {
 		fmt.Println(rw.Name())
 		return &SHM{
 			rw,
 			agent,
-		}
+		}, nil
 	}
 
-	fmt.Println("create simple shm error")
-	return nil
+	return nil, err
 }
 
-func shmClient(m Mode, url string, args ...interface{}) *SHM {
-
+func shmClient(m Mode, url string, args ...interface{}) (*SHM, error) {
 	if m != Shm {
-		fmt.Println("this is not a shm mode: ", m)
-		return nil
+		return nil, errors.New("please use deliver.Shm mode")
 	}
 
-	if rw, err := shm.OpenSimplex(url); err == nil {
+	rw, err := shm.OpenSimplex(url)
+	if err == nil {
 		return &SHM{
 			rw,
 			coactee,
-		}
+		}, nil
 	}
-	fmt.Println("shmConsumer open error")
-	return nil
+	return nil, err
 }

--
Gitblit v1.8.0