From 82d9e35da6a3ff5f614025a09fdcefa9e4cfb6c3 Mon Sep 17 00:00:00 2001 From: Alvaro Saurin Date: Mon, 9 Nov 2015 13:44:26 +0100 Subject: [PATCH] Use the "name" set for the connection details --- render/detailed_node.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/render/detailed_node.go b/render/detailed_node.go index 82dd28267..5d6d589ea 100644 --- a/render/detailed_node.go +++ b/render/detailed_node.go @@ -210,10 +210,10 @@ func OriginTable(r report.Report, originID string, addHostTags bool, addContaine func connectionDetailsRows(topology report.Topology, originID string) []Row { rows := []Row{} - labeler := func(nodeID string, meta map[string]string) (string, bool) { + labeler := func(nodeID string, sets report.Sets) (string, bool) { if _, addr, port, ok := report.ParseEndpointNodeID(nodeID); ok { - if name, ok := meta["name"]; ok { - return fmt.Sprintf("%s:%s", name, port), true + if names, ok := sets["name"]; ok { + return fmt.Sprintf("%s:%s", names[0], port), true } return fmt.Sprintf("%s:%s", addr, port), true } @@ -222,13 +222,13 @@ func connectionDetailsRows(topology report.Topology, originID string) []Row { } return "", false } - local, ok := labeler(originID, topology.Nodes[originID].Metadata) + local, ok := labeler(originID, topology.Nodes[originID].Sets) if !ok { return rows } // Firstly, collection outgoing connections from this node. for _, serverNodeID := range topology.Nodes[originID].Adjacency { - remote, ok := labeler(serverNodeID, topology.Nodes[serverNodeID].Metadata) + remote, ok := labeler(serverNodeID, topology.Nodes[serverNodeID].Sets) if !ok { continue } @@ -247,7 +247,7 @@ func connectionDetailsRows(topology report.Topology, originID string) []Row { if !serverNodeIDs.Contains(originID) { continue } - remote, ok := labeler(clientNodeID, clientNode.Metadata) + remote, ok := labeler(clientNodeID, clientNode.Sets) if !ok { continue }