fix dir

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

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 5fb0726..a9ac263 100644 (file)
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -2,11 +2,10 @@ package monitor
 
 import (
        "fmt"
-       "io/ioutil"
        "os"
        "os/user"
        "strings"
-       "time"
+       "sync"
 
        "github.com/jinzhu/gorm"
        log "github.com/sirupsen/logrus"
@@ -17,9 +16,8 @@ import (
        "github.com/vapor/event"
        "github.com/vapor/netsync/chainmgr"
        "github.com/vapor/netsync/consensusmgr"
-       "github.com/vapor/p2p"
-       // msgs "github.com/vapor/netsync/messages"
        "github.com/vapor/netsync/peers"
+       "github.com/vapor/p2p"
        "github.com/vapor/p2p/discover/dht"
        "github.com/vapor/p2p/discover/mdns"
        "github.com/vapor/p2p/signlib"
@@ -28,20 +26,26 @@ import (
 )
 
 type monitor struct {
+       *sync.RWMutex
        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
+       // discvMap maps a node's public key to the node itself
+       discvMap map[string]*dht.Node
+       discvCh  chan *dht.Node
+       dialCh   chan struct{}
+       // TODO: maybe remove?
+       checkStatusCh chan struct{}
 }
 
 // TODO: set myself as SPV?
 func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
        //TODO: for test
-       cfg.CheckFreqSeconds = 5
+       cfg.CheckFreqSeconds = 15
 
        dbPath, err := makePath()
        if err != nil {
@@ -55,7 +59,6 @@ func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
        }
        nodeCfg.DBPath = dbPath
        nodeCfg.ChainID = "mainnet"
-       discvCh := make(chan *dht.Node)
        privKey, err := signlib.NewPrivKey()
        if err != nil {
                log.Fatal(err)
@@ -67,16 +70,21 @@ 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,
+               RWMutex:       &sync.RWMutex{},
+               cfg:           cfg,
+               db:            db,
+               nodeCfg:       nodeCfg,
+               privKey:       privKey.(chainkd.XPrv),
+               chain:         chain,
+               txPool:        txPool,
+               discvMap:      make(map[string]*dht.Node),
+               discvCh:       make(chan *dht.Node),
+               dialCh:        make(chan struct{}, 1),
+               checkStatusCh: make(chan struct{}, 1),
        }
 }
 
+// TODO: need to fix temp and "discover"
 func makePath() (string, error) {
        usr, err := user.Current()
        if err != nil {
@@ -88,12 +96,7 @@ func makePath() (string, error) {
                return "", err
        }
 
-       tmpDir, err := ioutil.TempDir(dataPath, "")
-       if err != nil {
-               return "", err
-       }
-
-       return tmpDir, nil
+       return dataPath, nil
 }
 
 func (m *monitor) Run() {
@@ -111,8 +114,10 @@ func (m *monitor) Run() {
                log.Fatal(err)
        }
 
-       go m.discoveryRoutine()
-       go m.collectDiscoveredNodes()
+       m.dialCh <- struct{}{}
+       var discvWg sync.WaitGroup
+       go m.discoveryRoutine(&discvWg)
+       go m.collectDiscoveredNodes(&discvWg)
        go m.connectNodesRoutine()
        go m.checkStatusRoutine()
 }
@@ -147,7 +152,7 @@ func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
        }
 
        for label, reactor := range m.sw.GetReactors() {
-               log.Debug("start reactor: (%s:%v)", label, reactor)
+               log.Debugf("start reactor: (%s:%v)", label, reactor)
                if _, err := reactor.Start(); err != nil {
                        return nil
                }
@@ -155,7 +160,6 @@ func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
 
        m.sw.GetSecurity().RegisterFilter(m.sw.GetNodeInfo())
        m.sw.GetSecurity().RegisterFilter(m.sw.GetPeers())
-
        return m.sw.GetSecurity().Start()
 }
 
@@ -165,19 +169,13 @@ func (m *monitor) checkStatusRoutine() {
                log.Fatal(err)
        }
 
-       protocolReactor, ok := m.sw.GetReactors()["PROTOCOL"]
-       if !ok {
-               log.Fatal("protocolReactor not found")
-       }
-
        bestHeight := uint64(0)
-       ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second)
-       // TODO: change back to start immediately
-       for range ticker.C {
+       for range m.checkStatusCh {
                for _, peer := range m.sw.GetPeers().List() {
                        peer.Start()
-                       protocolReactor.AddPeer(peer)
+                       peers.AddPeer(peer)
                }
+               log.Infof("%d connected peers: %v", len(m.sw.GetPeers().List()), m.sw.GetPeers().List())
 
                for _, peer := range m.sw.GetPeers().List() {
                        p := peers.GetPeer(peer.ID())
@@ -186,6 +184,7 @@ func (m *monitor) checkStatusRoutine() {
                        }
 
                        if err := p.SendStatus(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
+                               log.Error(err)
                                peers.RemovePeer(p.ID())
                        }
                }
@@ -194,10 +193,9 @@ func (m *monitor) checkStatusRoutine() {
                        if peerInfo.Height > bestHeight {
                                bestHeight = peerInfo.Height
                        }
-
-                       m.savePeerInfo(peerInfo)
                }
-               log.Info("bestHeight", bestHeight)
+               log.Info("bestHeight: ", bestHeight)
+               m.processPeerInfos(peers.GetPeerInfos())
 
                for _, peer := range m.sw.GetPeers().List() {
                        p := peers.GetPeer(peer.ID())
@@ -207,11 +205,8 @@ func (m *monitor) checkStatusRoutine() {
 
                        peers.RemovePeer(p.ID())
                }
-
-               // TODO:
-               // msg := struct{ msgs.BlockchainMessage }{&msgs.GetBlockMessage{Height: bestHeight + 1}}
-               // for _, peer := range m.sw.GetPeers().List() {
-               //      peers.SendMsg(peer.ID(), msgs.BlockchainChannel, msg)
-               // }
+               log.Info("Disonnect all peers.")
+               m.Unlock()
+               m.dialCh <- struct{}{}
        }
 }