OSDN Git Service
(root)
/
bytom
/
vapor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
66e9120
)
fix log
author
HAOYUatHZ
<haoyu@protonmail.com>
Thu, 29 Aug 2019 06:02:41 +0000
(14:02 +0800)
committer
HAOYUatHZ
<haoyu@protonmail.com>
Thu, 29 Aug 2019 06:02:41 +0000
(14:02 +0800)
toolbar/precog/monitor/connection.go
patch
|
blob
|
history
toolbar/precog/monitor/discover.go
patch
|
blob
|
history
toolbar/precog/monitor/monitor.go
patch
|
blob
|
history
toolbar/precog/monitor/stats.go
patch
|
blob
|
history
diff --git
a/toolbar/precog/monitor/connection.go
b/toolbar/precog/monitor/connection.go
index
a6b4826
..
20093fb
100644
(file)
--- a/
toolbar/precog/monitor/connection.go
+++ b/
toolbar/precog/monitor/connection.go
@@
-18,7
+18,7
@@
func (m *monitor) connectNodesRoutine() {
m.Lock()
if err := m.dialNodes(); err != nil {
m.Lock()
if err := m.dialNodes(); err != nil {
- log.
Error(err
)
+ log.
WithFields(log.Fields{"err": err}).Error("dialNodes"
)
}
}
}
}
}
}
diff --git
a/toolbar/precog/monitor/discover.go
b/toolbar/precog/monitor/discover.go
index
8bbe73a
..
2805a6d
100644
(file)
--- a/
toolbar/precog/monitor/discover.go
+++ b/
toolbar/precog/monitor/discover.go
@@
-26,7
+26,7
@@
func (m *monitor) discoveryRoutine() {
continue
}
continue
}
- log.
Infof("discover new node: %v", node
)
+ log.
WithFields(log.Fields{"new node": node}).Info("discover"
)
m.saveDiscoveredNode(node)
}
m.saveDiscoveredNode(node)
}
@@
-42,6
+42,9
@@
func (m *monitor) saveDiscoveredNode(node *dht.Node) {
}); err == nil {
m.discvMap[node.ID.String()] = node
} else {
}); err == nil {
m.discvMap[node.ID.String()] = node
} else {
- log.Error(err)
+ log.WithFields(log.Fields{
+ "node": node,
+ "err": err,
+ }).Error("upSertNode")
}
}
}
}
diff --git
a/toolbar/precog/monitor/monitor.go
b/toolbar/precog/monitor/monitor.go
index
6813427
..
e934990
100644
(file)
--- a/
toolbar/precog/monitor/monitor.go
+++ b/
toolbar/precog/monitor/monitor.go
@@
-44,7
+44,7
@@
type monitor struct {
func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
dbPath, err := makePath()
if err != nil {
func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
dbPath, err := makePath()
if err != nil {
- log.
Fatal(err
)
+ log.
WithFields(log.Fields{"err": err}).Fatal("makePath"
)
}
nodeCfg := &vaporCfg.Config{
}
nodeCfg := &vaporCfg.Config{
@@
-56,12
+56,12
@@
func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
nodeCfg.ChainID = "mainnet"
privKey, err := signlib.NewPrivKey()
if err != nil {
nodeCfg.ChainID = "mainnet"
privKey, err := signlib.NewPrivKey()
if err != nil {
- log.
Fatal(err
)
+ log.
WithFields(log.Fields{"err": err}).Fatal("NewPrivKey"
)
}
chain, txPool, err := mockChainAndPool()
if err != nil {
}
chain, txPool, err := mockChainAndPool()
if err != nil {
- log.
Fatal(err
)
+ log.
WithFields(log.Fields{"err": err}).Fatal("mockChainAndPool"
)
}
return &monitor{
}
return &monitor{
@@
-98,12
+98,15
@@
func (m *monitor) Run() {
for _, node := range m.cfg.Nodes {
seeds = append(seeds, fmt.Sprintf("%s:%d", node.IP, node.Port))
if err := m.upSertNode(&node); err != nil {
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.Error(err)
+ log.WithFields(log.Fields{
+ "node": node,
+ "err": err,
+ }).Error("upSertNode")
}
}
m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
if err := m.makeSwitch(); err != nil {
}
}
m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
if err := m.makeSwitch(); err != nil {
- log.
Fatal(err
)
+ log.
WithFields(log.Fields{"err": err}).Fatal("makeSwitch"
)
}
m.dialCh <- struct{}{}
}
m.dialCh <- struct{}{}
@@
-157,7
+160,7
@@
func (m *monitor) prepareReactors(peers *peers.PeerSet) error {
func (m *monitor) checkStatusRoutine() {
peers := peers.NewPeerSet(m.sw)
if err := m.prepareReactors(peers); err != nil {
func (m *monitor) checkStatusRoutine() {
peers := peers.NewPeerSet(m.sw)
if err := m.prepareReactors(peers); err != nil {
- log.
Fatal(err
)
+ log.
WithFields(log.Fields{"err": err}).Fatal("prepareReactors"
)
}
for range m.checkStatusCh {
}
for range m.checkStatusCh {
@@
-165,7
+168,10
@@
func (m *monitor) checkStatusRoutine() {
peer.Start()
peers.AddPeer(peer)
}
peer.Start()
peers.AddPeer(peer)
}
- log.Infof("%d connected peers: %v", len(m.sw.GetPeers().List()), m.sw.GetPeers().List())
+ log.WithFields(log.Fields{
+ "num": len(m.sw.GetPeers().List()),
+ "peers": m.sw.GetPeers().List(),
+ }).Info("connected peers")
for _, peer := range m.sw.GetPeers().List() {
p := peers.GetPeer(peer.ID())
for _, peer := range m.sw.GetPeers().List() {
p := peers.GetPeer(peer.ID())
@@
-173,8
+179,11
@@
func (m *monitor) checkStatusRoutine() {
continue
}
continue
}
- if err := p.SendStatus(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
- log.Error(err)
+ if err := p.(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
+ log.WithFields(log.Fields{
+ "peer": p,
+ "err": err,
+ }).Error("SendStatus")
peers.RemovePeer(p.ID())
}
}
peers.RemovePeer(p.ID())
}
}
diff --git
a/toolbar/precog/monitor/stats.go
b/toolbar/precog/monitor/stats.go
index
1ca3f30
..
e1c0d16
100644
(file)
--- a/
toolbar/precog/monitor/stats.go
+++ b/
toolbar/precog/monitor/stats.go
@@
-67,7
+67,10
@@
func (m *monitor) processDialResults() error {
publicKey := xPub.PublicKey().String()
connMap[publicKey] = true
if err := m.processConnectedPeer(publicKeyMap[publicKey], peer); err != nil {
publicKey := xPub.PublicKey().String()
connMap[publicKey] = true
if err := m.processConnectedPeer(publicKeyMap[publicKey], peer); err != nil {
- log.WithFields(log.Fields{"err": err}).Error("processConnectedPeer")
+ log.WithFields(log.Fields{
+ "peer publicKey": publicKey,
+ "err": err,
+ }).Error("processConnectedPeer")
}
}
}
}
@@
-78,7
+81,10
@@
func (m *monitor) processDialResults() error {
}
if err := m.processOfflinePeer(ormNode); err != nil {
}
if err := m.processOfflinePeer(ormNode); err != nil {
- log.WithFields(log.Fields{"err": err}).Error("processOfflinePeer")
+ log.WithFields(log.Fields{
+ "peer publicKey": ormNode.PublicKey,
+ "err": err,
+ }).Error("processOfflinePeer")
}
}
}
}
@@
-117,7
+123,10
@@
func (m *monitor) processPeerInfos(peerInfos []*peers.PeerInfo) error {
for _, peerInfo := range peerInfos {
dbTx := m.db.Begin()
if err := m.processPeerInfo(dbTx, peerInfo); err != nil {
for _, peerInfo := range peerInfos {
dbTx := m.db.Begin()
if err := m.processPeerInfo(dbTx, peerInfo); err != nil {
- log.WithFields(log.Fields{"err": err}).Error("processPeerInfo")
+ log.WithFields(log.Fields{
+ "peerInfo": peerInfo,
+ "err": err,
+ }).Error("processPeerInfo")
dbTx.Rollback()
} else {
dbTx.Commit()
dbTx.Rollback()
} else {
dbTx.Commit()