From 676391a8b3411ba66fa50841825650bb147199cb Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Tue, 13 Aug 2019 16:55:20 +0800 Subject: [PATCH] clean --- toolbar/precog/monitor/monitor.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go index dc572a3e..8b99b7f7 100644 --- a/toolbar/precog/monitor/monitor.go +++ b/toolbar/precog/monitor/monitor.go @@ -80,13 +80,7 @@ func (m *monitor) Run() { go m.discovery() go m.collectDiscv() - - m.cfg.CheckFreqSeconds = 60 - ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second) - for ; true; <-ticker.C { - // TODO: lock? - m.monitorRountine() - } + go m.dialRoutine() } // create or update: https://github.com/jinzhu/gorm/issues/1307 @@ -158,10 +152,20 @@ func (m *monitor) collectDiscv() { } } -func (m *monitor) monitorRountine() error { +func (m *monitor) dialRoutine() { + // TODO: rm hardcode + m.cfg.CheckFreqSeconds = 60 + ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second) + for ; true; <-ticker.C { + m.dialNodes() + } +} + +func (m *monitor) dialNodes() { var nodes []*orm.Node if err := m.db.Model(&orm.Node{}).Find(&nodes).Error; err != nil { - return err + log.Error(err) + return } addresses := make([]*p2p.NetAddress, 0) @@ -176,12 +180,6 @@ func (m *monitor) monitorRountine() error { } m.sw.DialPeers(addresses) - - // TODO: dail nodes, get lantency & best_height - // TODO: decide check_height("best best_height" - "confirmations") - // TODO: get blockhash by check_height, get latency - // TODO: update lantency, active_time and status - return nil } // TODO: @@ -191,3 +189,7 @@ func (m *monitor) monitorRountine() error { // p2p/switch_test.go // syncManager // notificationMgr +// TODO: dail nodes, get lantency & best_height +// TODO: decide check_height("best best_height" - "confirmations") +// TODO: get blockhash by check_height, get latency +// TODO: update lantency, active_time and status -- 2.11.0