From 69c4ca313729802d0b1b59450da4d3cc8c19f909 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Mon, 19 Aug 2019 10:25:37 +0800
Subject: [PATCH] rename

---
 toolbar/precog/monitor/monitor.go            | 37 +++++++++++++---------------
 toolbar/precog/monitor/{crud.go => stats.go} | 15 +++++++++++
 2 files changed, 32 insertions(+), 20 deletions(-)
 rename toolbar/precog/monitor/{crud.go => stats.go} (75%)

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index da4ad9b4..0b604e80 100644
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -28,16 +28,14 @@ import (
 )
 
 type monitor struct {
-	cfg               *config.Config
-	db                *gorm.DB
-	nodeCfg           *vaporCfg.Config
-	sw                *p2p.Switch
-	discvCh           chan *dht.Node
-	privKey           chainkd.XPrv
-	chain             *mock.Chain
-	txPool            *mock.Mempool
-	tryConnectStartCh chan struct{}
-	tryConnectEndCh   chan struct{}
+	cfg     *config.Config
+	db      *gorm.DB
+	nodeCfg *vaporCfg.Config
+	sw      *p2p.Switch
+	discvCh chan *dht.Node
+	privKey chainkd.XPrv
+	chain   *mock.Chain
+	txPool  *mock.Mempool
 }
 
 // TODO: set myself as SPV?
@@ -69,15 +67,13 @@ func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
 	}
 
 	return &monitor{
-		cfg:               cfg,
-		db:                db,
-		nodeCfg:           nodeCfg,
-		discvCh:           discvCh,
-		privKey:           privKey.(chainkd.XPrv),
-		chain:             chain,
-		txPool:            txPool,
-		tryConnectStartCh: make(chan struct{}, 1),
-		tryConnectEndCh:   make(chan struct{}, 1),
+		cfg:     cfg,
+		db:      db,
+		nodeCfg: nodeCfg,
+		discvCh: discvCh,
+		privKey: privKey.(chainkd.XPrv),
+		chain:   chain,
+		txPool:  txPool,
 	}
 }
 
@@ -176,8 +172,9 @@ func (m *monitor) checkStatusRoutine() {
 
 	bestHeight := uint64(0)
 	ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second)
-	// TODO: change back to start immediately
 	for range ticker.C {
+		log.Info("m.sw.GetPeers().List()", m.sw.GetPeers().List())
+
 		for _, peer := range m.sw.GetPeers().List() {
 			peer.Start()
 			protocolReactor.AddPeer(peer)
diff --git a/toolbar/precog/monitor/crud.go b/toolbar/precog/monitor/stats.go
similarity index 75%
rename from toolbar/precog/monitor/crud.go
rename to toolbar/precog/monitor/stats.go
index 77967360..5bf9eb8c 100644
--- a/toolbar/precog/monitor/crud.go
+++ b/toolbar/precog/monitor/stats.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/jinzhu/gorm"
 
+	"github.com/vapor/crypto/ed25519/chainkd"
 	"github.com/vapor/netsync/peers"
 	"github.com/vapor/toolbar/precog/config"
 	"github.com/vapor/toolbar/precog/database/orm"
@@ -45,5 +46,19 @@ func (m *monitor) upSertNode(node *config.Node) error {
 }
 
 func (m *monitor) savePeerInfo(peerInfo *peers.PeerInfo) error {
+	xPub := &chainkd.XPub{}
+	if err := xPub.UnmarshalText([]peerInfo.ID()); err != nil {
+		return err
+	}
+
+	ormNode := &orm.Node{}
+	if err := m.db.Model(&orm.Node{}).Where(&orm.Node{PublicKey: xPub.PublicKey.String()}).
+		UpdateColumn(&orm.Node{
+			BestHeight: peerInfo.Height,
+			// LatestDailyUptimeMinutes uint64
+		}).First(ormNode).Error; err != nil {
+		return err
+	}
+
 	return nil
 }
-- 
2.11.0