From 0495bb9aa85ffd7dfe4ee268c768c423982f8afb Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 04 九月 2019 19:44:05 +0800
Subject: [PATCH] 修改加入集群的接口，需要ip加端口
---
searcher.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/searcher.go b/searcher.go
index d1736e6..68e4a13 100644
--- a/searcher.go
+++ b/searcher.go
@@ -9,7 +9,7 @@
)
var (
- members [][]byte
+ members = make(map[string]NodeInfo,0)
delay time.Duration
)
@@ -53,8 +53,12 @@
// NotifyMsg is called when a user-data message is received
func (d *delegate) NotifyMsg(b []byte) {
// logMsg(b)
- fmt.Println(b)
- members = append(members, b)
+ n := NodeInfo{}
+ if err:= json.Unmarshal(b, &n);err ==nil {
+ members[n.NodeID] = n
+ } else {
+ fmt.Println("NotifyMsg msg unmarshal err")
+ }
}
func logMsg(b []byte) {
@@ -91,21 +95,24 @@
return memberlist.Create(conf)
}
-func CreateSearchNodeWhitClose(key string, delay time.Duration) [][]byte {
+func CreateSearchNodeWhitClose(key string, delay time.Duration) map[string]NodeInfo {
m, err := CreateSearchNode(key)
if err == nil {
// fmt.Printf("Local member %s:%d\n", m.LocalNode().Addr, m.LocalNode().Port)
time.Sleep(delay)
m.Shutdown()
+ fmt.Println("CreateSearchNodeWhitClose after ",delay,",shutdown success")
}
return members
}
func CloseSearchNode(m *memberlist.Memberlist) error {
+ fmt.Println("CloseSearchNode")
+ defer fmt.Println("ShutDown done")
return m.Shutdown()
}
-func GetSearchNodes() [][]byte {
+func GetSearchNodes() map[string]NodeInfo {
return members
}
--
Gitblit v1.8.0