clean

[bytom/vapor.git] / toolbar / precog / monitor / monitor.go

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index ccc24c2..b8bb818 100644 (file)
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -5,7 +5,6 @@ import (
        "os"
        "os/user"
        "strings"
-       "sync"
 
        "github.com/jinzhu/gorm"
        log "github.com/sirupsen/logrus"
@@ -13,7 +12,6 @@ import (
        vaporCfg "github.com/vapor/config"
        "github.com/vapor/crypto/ed25519/chainkd"
        dbm "github.com/vapor/database/leveldb"
-       "github.com/vapor/errors"
        "github.com/vapor/event"
        "github.com/vapor/netsync/chainmgr"
        "github.com/vapor/netsync/consensusmgr"
@@ -26,17 +24,22 @@ import (
        "github.com/vapor/toolbar/precog/config"
 )
 
+// TODO:
+// 1. moniker 理论是安全的，只是记得测试一下，这么改不会让vapor node出坑
+// 2. StatusMap 感觉没什么问题，double check一下别的出名项目是不是也是这么叫的
+// 3. toolbar/precog/monitor/stats.go FirstOrCreate&Update 弱弱的问一下，直接save会出事么？
+// 4. 碰到一个玄学问题，究竟是以ip为单位，还是pubkey为单位。 如果同一个pubkey出现在2个不同的ip，会不会让数据混乱？
+// 6. NodeLiveness应该是存每次的通讯记录？至于一些统计数据之类的都丢node上去？
+// 7. m这个为什么需要锁呀？一个是节点发现，一个是生命探测，中间交互都是数据库把？
+
 type monitor struct {
-       *sync.RWMutex
-       cfg     *config.Config
-       db      *gorm.DB
-       nodeCfg *vaporCfg.Config
-       sw      *p2p.Switch
-       privKey chainkd.XPrv
-       chain   *mock.Chain
-       txPool  *mock.Mempool
-       // discvMap maps a node's public key to the node itself
-       discvMap       map[string]*dht.Node
+       cfg            *config.Config
+       db             *gorm.DB
+       nodeCfg        *vaporCfg.Config
+       sw             *p2p.Switch
+       privKey        chainkd.XPrv
+       chain          *mock.Chain
+       txPool         *mock.Mempool
        bestHeightSeen uint64
        peers          *peers.PeerSet
 }
@@ -65,14 +68,12 @@ func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
        }
 
        return &monitor{
-               RWMutex:        &sync.RWMutex{},
                cfg:            cfg,
                db:             db,
                nodeCfg:        nodeCfg,
                privKey:        privKey.(chainkd.XPrv),
                chain:          chain,
                txPool:         txPool,
-               discvMap:       make(map[string]*dht.Node),
                bestHeightSeen: uint64(0),
        }
 }
@@ -92,14 +93,6 @@ func makePath() (string, error) {
 }
 
 func (m *monitor) Run() {
-       var seeds []string
-       for _, node := range m.cfg.Nodes {
-               seeds = append(seeds, fmt.Sprintf("%s:%d", node.IP, node.Port))
-               if err := m.upSertNode(&node); err != nil {
-                       log.WithFields(log.Fields{"node": node, "err": err}).Error("upSertNode")
-               }
-       }
-       m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
        if err := m.makeSwitch(); err != nil {
                log.WithFields(log.Fields{"err": err}).Fatal("makeSwitch")
        }
@@ -109,6 +102,12 @@ func (m *monitor) Run() {
 }
 
 func (m *monitor) makeSwitch() error {
+       var seeds []string
+       for _, node := range m.cfg.Nodes {
+               seeds = append(seeds, fmt.Sprintf("%s:%d", node.IP, node.Port))
+       }
+       m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
+
        l, listenAddr := p2p.GetListener(m.nodeCfg.P2P)
        discv, err := dht.NewDiscover(m.nodeCfg, m.privKey, l.ExternalAddress().Port, m.cfg.NetworkID)
        if err != nil {
@@ -123,11 +122,7 @@ func (m *monitor) makeSwitch() error {
        }
 
        m.peers = peers.NewPeerSet(m.sw)
-       if err := m.prepareReactors(m.peers); err != nil {
-               return errors.Wrap(err, "prepareReactors")
-       }
-
-       return nil
+       return m.prepareReactors(m.peers)
 }
 
 func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
@@ -143,7 +138,7 @@ func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
        for label, reactor := range m.sw.GetReactors() {
                log.WithFields(log.Fields{"label": label, "reactor": reactor}).Debug("start reactor")
                if _, err := reactor.Start(); err != nil {
-                       return nil
+                       return err
                }
        }