From e0875bfe6196fdf4abdc7c099bbb59e7282f1b48 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 22 五月 2019 13:38:04 +0800
Subject: [PATCH] update deliver
---
runShm2.go | 18 ++++++++++++++++--
runShm.go | 21 ++++++++++++++++++---
deliver | 2 +-
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/deliver b/deliver
index a8b90cf..c2bbe31 160000
--- a/deliver
+++ b/deliver
@@ -1 +1 @@
-Subproject commit a8b90cfcf722f4b1c4aac9f318e35824f02b8787
+Subproject commit c2bbe31e7c6c9f83f7bcce26dea98bc18ed8f39c
diff --git a/shm.go b/runShm.go
similarity index 78%
rename from shm.go
rename to runShm.go
index abb0ba5..1f05617 100644
--- a/shm.go
+++ b/runShm.go
@@ -38,8 +38,15 @@
}
func shmSender(url string, args ...interface{}) {
- s := deliver.NewServer(deliver.Shm, url, args...)
-
+ s, err := deliver.NewServerWithError(deliver.Shm, url, args...)
+ for {
+ if err == nil {
+ break
+ }
+ fmt.Println("create shm error : ", err)
+ time.Sleep(1 * time.Second)
+ s, err = deliver.NewServerWithError(deliver.Shm, url, args)
+ }
go shmSenderImpl(s)
c := make(chan os.Signal, 1)
@@ -97,7 +104,15 @@
var cs []deliver.Deliver
for i := 0; i < count; i++ {
wg.Add(1)
- c := deliver.NewClient(deliver.Shm, url)
+ c, err := deliver.NewClientWithError(deliver.Shm, url)
+ for {
+ if err == nil {
+ break
+ }
+ time.Sleep(1 * time.Second)
+ c, err = deliver.NewClientWithError(deliver.Shm, url)
+ fmt.Println(i, " client create failed : ", err)
+ }
cs = append(cs, c)
go shmRecvImpl(&wg, c, url, i)
}
diff --git a/shm2.go b/runShm2.go
similarity index 80%
rename from shm2.go
rename to runShm2.go
index 791241d..34ea9df 100644
--- a/shm2.go
+++ b/runShm2.go
@@ -37,7 +37,14 @@
}
func shmReciever2(url string, count int, args ...interface{}) {
- s := deliver.NewServer(deliver.Shm, url, args...)
+ s, err := deliver.NewServerWithError(deliver.Shm, url, args...)
+ for {
+ if err == nil {
+ break
+ }
+ time.Sleep(1 * time.Second)
+ s, err = deliver.NewServerWithError(deliver.Shm, url, args...)
+ }
go shmRecvImpl2(s, 0)
@@ -92,7 +99,14 @@
var cs []deliver.Deliver
for i := 0; i < count; i++ {
- c := deliver.NewClient(deliver.Shm, url)
+ c, err := deliver.NewClientWithError(deliver.Shm, url)
+ for {
+ if err == nil {
+ break
+ }
+ time.Sleep(1 * time.Second)
+ c, err = deliver.NewClientWithError(deliver.Shm, url)
+ }
cs = append(cs, c)
go shmSenderImpl2(c)
}
--
Gitblit v1.8.0