From 9570ba882a13388a16d2980fd93da25fe27e7480 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 11 十月 2019 16:39:21 +0800
Subject: [PATCH] add log
---
agent.go | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/agent.go b/agent.go
index 974a29f..0e36706 100644
--- a/agent.go
+++ b/agent.go
@@ -82,8 +82,6 @@
}
serfConf.MemberlistConfig.Keyring = keyring
- serfConf.MemberlistConfig.Delegate = &UserDelegate{}
-
logger.Info("[INFO] agent: Restored keyring with %d keys from %s",
len(conf.EncryptKey), conf.EncryptKey)
@@ -216,11 +214,17 @@
}
}
}
+ logger.Debug("targetNode:",targetNode.Name)
if targetNode !=nil {
- sendErr := a.Serf().Memberlist().SendToTCP(targetNode, bytesReturn)
+ addr := targetNode.Addr.String() + ":" + strconv.Itoa(TcpTransportPort)
+ sendErr := rawSendTcpMsg(addr, bytesReturn)
+
if sendErr != nil {
logger.Debug("sendToTcp err:",sendErr)
+ } else {
+ logger.Debug("sendToTcp success")
}
+
} else {
logger.Debug("targetNode is nil")
}
@@ -263,6 +267,7 @@
//a.DeregisterEventHandler(a)
//close(a.readyCh)
}
+
func (a *Agent) BroadcastMemberlist(delay time.Duration) {
//serf := a.serf
@@ -514,32 +519,25 @@
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()
- //respCh := resp.ResponseCh()
for {
select {
- //case r := <-respCh:
- // logger.Info("Query response's len:", len(r.Payload))
- // err := json.Unmarshal(r.Payload, &dumpSqls)
- // if err ==nil {
- // logger.Error("dumpSql:",dumpSqls)
- // logger.Error("data dump success")
- // }
- // return
- case msg := <-QueryTcpResponseChan:
- logger.Debug("QueryTcpResponseChan receive msg len:",len(msg))
+ case <-tk.C:
+ return
+ case msg := <- QueryTcpResponseChan:
+ logger.Info("Query response's len:", len(msg))
err := json.Unmarshal(msg, &dumpSqls)
- if err ==nil {
- logger.Error("dumpSql success:",dumpSqls)
- } else {
- logger.Error("data dump err:",err)
+ if err == nil {
+ logger.Error("dumpSql:", dumpSqls)
+ logger.Error("data dump success")
}
return
}
-
}
- }()
+ }(ticker)
wg.Wait()
return &dumpSqls,nil
--
Gitblit v1.8.0