OSDN Git Service

fix
authorHAOYUatHZ <haoyu@protonmail.com>
Thu, 29 Aug 2019 06:49:52 +0000 (14:49 +0800)
committerHAOYUatHZ <haoyu@protonmail.com>
Thu, 29 Aug 2019 06:49:52 +0000 (14:49 +0800)
toolbar/precog/monitor/monitor.go
toolbar/precog/monitor/stats.go

index bfb7b5e..db23d0c 100644 (file)
@@ -98,10 +98,7 @@ 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 {
-                       log.WithFields(log.Fields{
-                               "node": node,
-                               "err":  err,
-                       }).Error("upSertNode")
+                       log.WithFields(log.Fields{"node": node, "err": err}).Error("upSertNode")
                }
        }
        m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
@@ -143,10 +140,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")
+               log.WithFields(log.Fields{"label": label, "reactor": reactor}).Debug("start reactor")
                if _, err := reactor.Start(); err != nil {
                        return nil
                }
@@ -168,10 +162,7 @@ func (m *monitor) checkStatusRoutine() {
                        peer.Start()
                        peers.AddPeer(peer)
                }
-               log.WithFields(log.Fields{
-                       "num":   len(m.sw.GetPeers().List()),
-                       "peers": m.sw.GetPeers().List(),
-               }).Info("connected peers")
+               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())
@@ -180,10 +171,7 @@ func (m *monitor) checkStatusRoutine() {
                        }
 
                        if err := p.SendStatus(m.chain.BestBlockHeader(), m.chain.LastIrreversibleHeader()); err != nil {
-                               log.WithFields(log.Fields{
-                                       "peer": p,
-                                       "err":  err,
-                               }).Error("SendStatus")
+                               log.WithFields(log.Fields{"peer": p, "err": err}).Error("SendStatus")
                                peers.RemovePeer(p.ID())
                        }
                }
index e3fe0de..3fdfcf9 100644 (file)
@@ -67,10 +67,7 @@ func (m *monitor) processDialResults() error {
                publicKey := xPub.PublicKey().String()
                connMap[publicKey] = true
                if err := m.processConnectedPeer(publicKeyMap[publicKey], peer); err != nil {
-                       log.WithFields(log.Fields{
-                               "peer publicKey": publicKey,
-                               "err":            err,
-                       }).Error("processConnectedPeer")
+                       log.WithFields(log.Fields{"peer publicKey": publicKey, "err": err}).Error("processConnectedPeer")
                }
        }
 
@@ -81,10 +78,7 @@ func (m *monitor) processDialResults() error {
                }
 
                if err := m.processOfflinePeer(ormNode); err != nil {
-                       log.WithFields(log.Fields{
-                               "peer publicKey": ormNode.PublicKey,
-                               "err":            err,
-                       }).Error("processOfflinePeer")
+                       log.WithFields(log.Fields{"peer publicKey": ormNode.PublicKey, "err": err}).Error("processOfflinePeer")
                }
        }
 
@@ -119,10 +113,7 @@ func (m *monitor) processPeerInfos(peerInfos []*peers.PeerInfo) {
        for _, peerInfo := range peerInfos {
                dbTx := m.db.Begin()
                if err := m.processPeerInfo(dbTx, peerInfo); err != nil {
-                       log.WithFields(log.Fields{
-                               "peerInfo": peerInfo,
-                               "err":      err,
-                       }).Error("processPeerInfo")
+                       log.WithFields(log.Fields{"peerInfo": peerInfo, "err": err}).Error("processPeerInfo")
                        dbTx.Rollback()
                } else {
                        dbTx.Commit()