fix displaying disconnected clients

ethpandaops · Nov 22, 2024 · 830bb97 · 830bb97
1 parent 0bb25a2
commit 830bb97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/handlers/clients_cl.go b/handlers/clients_cl.go
@@ -70,30 +70,37 @@ func buildCLPeerMapData() *models.ClientCLPageDataPeerMap {
 
 	for _, client := range services.GlobalBeaconService.GetConsensusClients() {
 		id := client.GetNodeIdentity()
+
+		var peerId string
 		if id == nil {
-			continue
+			peerId = fmt.Sprintf("unknown-%d", client.GetIndex())
+		} else {
+			peerId = id.PeerID
 		}
-		peerID := id.PeerID
-		if _, ok := nodes[peerID]; !ok {
+
+		if _, ok := nodes[peerId]; !ok {
 			node := models.ClientCLPageDataPeerMapNode{
-				ID:    peerID,
+				ID:    peerId,
 				Label: client.GetName(),
 				Group: "internal",
 			}
-			nodes[peerID] = &node
+			nodes[peerId] = &node
 			peerMap.ClientPageDataMapNode = append(peerMap.ClientPageDataMapNode, &node)
 		}
 	}
 
 	for _, client := range services.GlobalBeaconService.GetConsensusClients() {
 		id := client.GetNodeIdentity()
+
+		var peerId string
 		if id == nil {
-			continue
+			peerId = fmt.Sprintf("unknown-%d", client.GetIndex())
+		} else {
+			peerId = id.PeerID
 		}
-		peerId := id.PeerID
+
 		peers := client.GetNodePeers()
 		for _, peer := range peers {
-			peerId := peerId
 			// Check if the PeerId is already in the nodes map, if not add it as an "external" node
 			if _, ok := nodes[peer.PeerID]; !ok {
 				node := models.ClientCLPageDataPeerMapNode{

diff --git a/handlers/clients_el.go b/handlers/clients_el.go
@@ -68,7 +68,7 @@ func buildELPeerMapData() *models.ClientELPageDataPeerMap {
 
 	for _, client := range services.GlobalBeaconService.GetExecutionClients() {
 		nodeInfo := client.GetNodeInfo()
-		peerID := "unknown"
+		peerID := fmt.Sprintf("unknown-%v", client.GetIndex())
 		var en *enode.Node
 		var err error
 		if nodeInfo != nil && nodeInfo.Enode != "" {
@@ -104,10 +104,9 @@ func buildELPeerMapData() *models.ClientELPageDataPeerMap {
 			}
 		}
 		peers := client.GetNodePeers()
-		for _, peer := range peers {
-			nodeID := nodeID
+		for idx, peer := range peers {
 			en, err := enode.ParseV4(peer.Enode)
-			peerID := "unknown"
+			peerID := fmt.Sprintf("unknown-peer-%v-%v", client.GetIndex(), idx)
 			if err != nil {
 				logrus.WithFields(logrus.Fields{"client": client.GetName(), "enode": peer.Enode}).Error("failed to parse peer enode")
 			} else {