From a0c23fcec45d18efe14ba03128a976e1fc1b0f21 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 12 十月 2019 10:15:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/syncdb
---
agent.go | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/agent.go b/agent.go
index b64a425..ceb7479 100644
--- a/agent.go
+++ b/agent.go
@@ -61,9 +61,9 @@
}
// Create create serf agent with config
-func Create(conf *Config) (*Agent, error) {
+func Create(conf *Config, snapshotPath string) (*Agent, error) {
// config cover to serf config
- serfConf, err := conf.convertToSerf()
+ serfConf, err := conf.convertToSerf(snapshotPath)
if err != nil {
return nil, err
}
@@ -519,10 +519,14 @@
var wg sync.WaitGroup
wg.Add(1)
- go func() {
+ ticker := time.NewTicker(300*time.Second)
+ go func(tk *time.Ticker) {
+ defer tk.Stop()
defer wg.Done()
for {
select {
+ case <-tk.C:
+ return
case msg := <- QueryTcpResponseChan:
logger.Info("Query response's len:", len(msg))
err := json.Unmarshal(msg, &dumpSqls)
@@ -533,7 +537,7 @@
return
}
}
- }()
+ }(ticker)
wg.Wait()
return &dumpSqls,nil
@@ -582,8 +586,8 @@
}
//Init serf Init
-func Init(clusterID string, password string, nodeID string, addrs []string) (*Agent, error) {
- agent, err := InitNode(clusterID, password, nodeID)
+func Init(clusterID string, password string, nodeID string, addrs []string, snapshotPath string) (*Agent, error) {
+ agent, err := InitNode(clusterID, password, nodeID, snapshotPath)
if err != nil {
logger.Error("InitNode failed, error: %s", err)
return agent, err
@@ -599,7 +603,7 @@
}
//InitNode web鍚庡彴鏀跺埌鍒涘缓闆嗙兢鐨勮姹傦紝
-func InitNode(clusterID string, password string, nodeID string) (*Agent, error) {
+func InitNode(clusterID string, password string, nodeID string, snapshotPath string) (*Agent, error) {
conf := DefaultConfig()
logger.Info("clusterID:", clusterID, "password:", password, "nodeID:", nodeID)
conf.ClusterID = clusterID
@@ -615,7 +619,7 @@
}
conf.EncryptKey = password
}
- agent, err := Create(conf)
+ agent, err := Create(conf, snapshotPath)
if err != nil {
logger.Error("create agent failed, error: %s", err)
return agent, err
--
Gitblit v1.8.0