From be392a6596e481d82032d85060d1a072d327e3f4 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 22 八月 2019 15:30:35 +0800
Subject: [PATCH] test shm
---
deliver.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/deliver.go b/deliver.go
index 5d8167f..c22dc79 100644
--- a/deliver.go
+++ b/deliver.go
@@ -21,7 +21,10 @@
if m > ModeStart && m < ModeNNG {
return nngServer(m, url, args...)
} else if m == Shm {
- s, _ := shmServer(m, url, args...)
+ s, err := shmServer(m, url, args...)
+ if err != nil {
+ s = nil
+ }
return s
}
return nil
@@ -33,7 +36,10 @@
if m > ModeStart && m < ModeNNG {
return nngClient(m, url, args...)
} else if m == Shm {
- s, _ := shmClient(m, url, args...)
+ s, err := shmClient(m, url, args...)
+ if err != nil {
+ s = nil
+ }
return s
}
@@ -44,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...)
}
@@ -55,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