Browse Source

append proxy listen port and peer host interfaces to peerID map

Anish Mukherjee 2 years ago
parent
commit
0891dcb854
2 changed files with 13 additions and 9 deletions
  1. 6 4
      logic/peers.go
  2. 7 5
      models/metrics.go

+ 6 - 4
logic/peers.go

@@ -296,10 +296,12 @@ func GetPeerUpdateForHost(ctx context.Context, network string, host *models.Host
 
 				if node.Network == network { // add to peers map for metrics
 					hostPeerUpdate.PeerIDs[peerHost.PublicKey.String()] = models.IDandAddr{
-						ID:      peer.ID.String(),
-						Address: peer.PrimaryAddress(),
-						Name:    peerHost.Name,
-						Network: peer.Network,
+						ID:              peer.ID.String(),
+						Address:         peer.PrimaryAddress(),
+						Name:            peerHost.Name,
+						Network:         peer.Network,
+						Interfaces:      peerHost.Interfaces,
+						ProxyListenPort: peerHost.ProxyListenPort,
 					}
 					hostPeerUpdate.NodePeers = append(hostPeerUpdate.NodePeers, nodePeer)
 				}

+ 7 - 5
models/metrics.go

@@ -28,11 +28,13 @@ type Metric struct {
 
 // IDandAddr - struct to hold ID and primary Address
 type IDandAddr struct {
-	ID       string `json:"id" bson:"id" yaml:"id"`
-	Address  string `json:"address" bson:"address" yaml:"address"`
-	Name     string `json:"name" bson:"name" yaml:"name"`
-	IsServer string `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
-	Network  string `json:"network" bson:"network" yaml:"network" validate:"network"`
+	ID              string  `json:"id" bson:"id" yaml:"id"`
+	Address         string  `json:"address" bson:"address" yaml:"address"`
+	Name            string  `json:"name" bson:"name" yaml:"name"`
+	IsServer        string  `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
+	Network         string  `json:"network" bson:"network" yaml:"network" validate:"network"`
+	Interfaces      []Iface `json:"interfaces" yaml:"interfaces"`
+	ProxyListenPort int     `json:"proxy_listen_port" yaml:"proxy_listen_port"`
 }
 
 // PeerMap - peer map for ids and addresses in metrics