From 75369acb42d4ab4fc359c786f0991fd1ff9ab60a Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 19 Aug 2015 10:06:57 +0000 Subject: [PATCH] Review feedback --- render/detailed_node.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/render/detailed_node.go b/render/detailed_node.go index 814989a1f..77fc7bd13 100644 --- a/render/detailed_node.go +++ b/render/detailed_node.go @@ -153,25 +153,28 @@ func OriginTable(r report.Report, originID string) (Table, bool) { func connectionDetailsRows(topology report.Topology, originID string) []Row { rows := []Row{} - - labeler := func(nodeID string) string { + labeler := func(nodeID string) (string, bool) { if _, addr, port, ok := report.ParseEndpointNodeID(nodeID); ok { - return fmt.Sprintf("%s:%s", addr, port) + return fmt.Sprintf("%s:%s", addr, port), true } if _, addr, ok := report.ParseAddressNodeID(nodeID); ok { - return addr + return addr, true } - return "" + return "", false + } + local, ok := labeler(originID) + if !ok { + return rows } - - local := labeler(originID) adjacencies := topology.Adjacency[report.MakeAdjacencyID(originID)] sort.Strings(adjacencies) for _, nodeID := range adjacencies { - rows = append(rows, Row{ - Key: local, - ValueMajor: labeler(nodeID), - }) + if remote, ok := labeler(nodeID); ok { + rows = append(rows, Row{ + Key: local, + ValueMajor: remote, + }) + } } return rows }