rename node.host to node.ip

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

diff --git a/toolbar/precog/monitor/stats.go b/toolbar/precog/monitor/stats.go
index 3cfcaa8..0b1eaca 100644 (file)
--- a/toolbar/precog/monitor/stats.go
+++ b/toolbar/precog/monitor/stats.go
@@ -33,13 +33,13 @@ func (m *monitor) upSertNode(node *config.Node) error {
        if node.XPub != nil {
                ormNode.Xpub = node.XPub.String()
        }
-       ormNode.Host = node.Host
+       ormNode.IP = node.IP
        ormNode.Port = node.Port
        return m.db.Where(&orm.Node{PublicKey: ormNode.PublicKey}).
                Assign(&orm.Node{
                        Xpub:  ormNode.Xpub,
                        Alias: ormNode.Alias,
-                       Host:  ormNode.Host,
+                       IP:    ormNode.IP,
                        Port:  ormNode.Port,
                }).FirstOrCreate(ormNode).Error
 }
@@ -186,15 +186,11 @@ func (m *monitor) processPeerInfo(dbTx *gorm.DB, peerInfo *peers.PeerInfo) error
                total += ormNodeLiveness.UpdatedAt.Sub(ormNodeLiveness.CreatedAt)
        }
 
-       if err := dbTx.Model(&orm.Node{}).Where(&orm.Node{PublicKey: xPub.PublicKey().String()}).
+       return dbTx.Model(&orm.Node{}).Where(&orm.Node{PublicKey: xPub.PublicKey().String()}).
                UpdateColumn(&orm.Node{
                        Alias:                    peerInfo.Moniker,
                        Xpub:                     peerInfo.ID,
                        BestHeight:               peerInfo.Height,
                        LatestDailyUptimeMinutes: uint64(total.Minutes()),
-               }).First(ormNode).Error; err != nil {
-               return err
-       }
-
-       return nil
+               }).First(ormNode).Error
 }