package monitor
import (
- // "encoding/binary"
- // "encoding/hex"
"fmt"
- "io/ioutil"
"os"
- // "os/user"
+ "os/user"
"strings"
- "time"
+ "sync"
"github.com/jinzhu/gorm"
log "github.com/sirupsen/logrus"
- // dbm "github.com/vapor/database/leveldb"
vaporCfg "github.com/vapor/config"
"github.com/vapor/crypto/ed25519/chainkd"
dbm "github.com/vapor/database/leveldb"
"github.com/vapor/event"
- "github.com/vapor/p2p"
- // conn "github.com/vapor/p2p/connection"
"github.com/vapor/netsync/chainmgr"
"github.com/vapor/netsync/consensusmgr"
"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"
)
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 = 1
+ cfg.CheckFreqSeconds = 15
- tmpDir, err := ioutil.TempDir(".", "vpPrecog")
+ dbPath, err := makePath()
if err != nil {
- log.Fatalf("failed to create temporary data folder: %v", err)
+ log.Fatal(err)
}
nodeCfg := &vaporCfg.Config{
P2P: vaporCfg.DefaultP2PConfig(),
Federation: vaporCfg.DefaultFederationConfig(),
}
- nodeCfg.DBPath = tmpDir
+ nodeCfg.DBPath = dbPath
nodeCfg.ChainID = "mainnet"
- discvCh := make(chan *dht.Node)
privKey, err := signlib.NewPrivKey()
if err != nil {
log.Fatal(err)
}
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 {
+ return "", err
+ }
+
+ dataPath := usr.HomeDir + "/.precog"
+ if err := os.MkdirAll(dataPath, os.ModePerm); err != nil {
+ return "", err
}
+
+ return dataPath, nil
}
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()
}
return err
}
- // TODO: clean up?? only start reactors??
- m.sw.Start()
-
- // for label, reactor := range m.sw.GetReactors() {
- // log.Debug("start reactor: (%s:%v)", label, reactor)
- // if _, err := reactor.Start(); err != nil {
- // return
- // }
- // }
-
- // m.sw.GetSecurity().RegisterFilter(m.sw.GetNodeInfo())
- // m.sw.GetSecurity().RegisterFilter(m.sw.GetPeers())
- // if err := m.sw.GetSecurity().Start(); err != nil {
- // return
- // }
+ for label, reactor := range m.sw.GetReactors() {
+ log.Debugf("start reactor: (%s:%v)", label, reactor)
+ if _, err := reactor.Start(); err != nil {
+ return nil
+ }
+ }
- return nil
+ m.sw.GetSecurity().RegisterFilter(m.sw.GetNodeInfo())
+ m.sw.GetSecurity().RegisterFilter(m.sw.GetPeers())
+ return m.sw.GetSecurity().Start()
}
func (m *monitor) checkStatusRoutine() {
log.Fatal(err)
}
- ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second)
- for ; true; <-ticker.C {
- for _, reactor := range m.sw.GetReactors() {
- for _, peer := range m.sw.GetPeers().List() {
- log.Debug("AddPeer %v for reactor %v", peer, reactor)
- // TODO: if not in sw
- reactor.AddPeer(peer)
+ bestHeight := uint64(0)
+ for range m.checkStatusCh {
+ for _, peer := range m.sw.GetPeers().List() {
+ peer.Start()
+ 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())
+ if p == nil {
+ continue
+ }
+
+ if err := p.SendStatus(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
+ log.Error(err)
+ peers.RemovePeer(p.ID())
}
}
for _, peerInfo := range peers.GetPeerInfos() {
- log.Info(peerInfo)
+ if peerInfo.Height > bestHeight {
+ bestHeight = peerInfo.Height
+ }
+ }
+ log.Info("bestHeight: ", bestHeight)
+ m.processPeerInfos(peers.GetPeerInfos())
+
+ for _, peer := range m.sw.GetPeers().List() {
+ p := peers.GetPeer(peer.ID())
+ if p == nil {
+ continue
+ }
+
+ peers.RemovePeer(p.ID())
}
+ log.Info("Disonnect all peers.")
+ m.Unlock()
+ m.dialCh <- struct{}{}
}
}
OSDN Git Service
