From 358b642159f15ac96cdaea6291b49c6774a2ee5d Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Sat, 31 Aug 2019 18:50:01 +0800 Subject: [PATCH] check --- toolbar/precog/monitor/monitor.go | 1 - toolbar/precog/monitor/stats.go | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go index 04ca1bd4..6eb732d5 100644 --- a/toolbar/precog/monitor/monitor.go +++ b/toolbar/precog/monitor/monitor.go @@ -25,7 +25,6 @@ import ( ) // TODO: -// 1. moniker 理论是安全的,只是记得测试一下,这么改不会让vapor node出坑 // 3. toolbar/precog/monitor/stats.go FirstOrCreate&Update 弱弱的问一下,直接save会出事么? // 4. 碰到一个玄学问题,究竟是以ip为单位,还是pubkey为单位。 如果同一个pubkey出现在2个不同的ip,会不会让数据混乱? // 6. ***NodeLiveness应该是存每次的通讯记录?至于一些统计数据之类的都丢node上去? diff --git a/toolbar/precog/monitor/stats.go b/toolbar/precog/monitor/stats.go index 92090b38..2dd27294 100644 --- a/toolbar/precog/monitor/stats.go +++ b/toolbar/precog/monitor/stats.go @@ -124,6 +124,10 @@ func (m *monitor) processPeerInfo(dbTx *gorm.DB, peerInfo *peers.PeerInfo) error return err } + if ormNode.Status == common.NodeOfflineStatus { + return fmt.Errorf("node %s status error", ormNode.PublicKey) + } + log.WithFields(log.Fields{"ping": peerInfo.Ping}).Debug("peerInfo") ping, err := time.ParseDuration(peerInfo.Ping) if err != nil { @@ -142,10 +146,6 @@ func (m *monitor) processPeerInfo(dbTx *gorm.DB, peerInfo *peers.PeerInfo) error // update latest liveness latestLiveness := ormNodeLivenesses[0] - // if latestLiveness.Status == common.NodeOfflineStatus { - // return fmt.Errorf("node %s latest liveness status error", ormNode.PublicKey) - // } - lantencyMS := ping.Nanoseconds() / 1000 if lantencyMS != 0 { latestLiveness.AvgLantencyMS = sql.NullInt64{ -- 2.11.0