From ec0689b5aa3ae2d2326f3a751c33bf3632380d8b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 6 Nov 2017 21:58:47 +0000 Subject: [PATCH] Code review: improve consistency of naming and ordering --- render/host.go | 6 +++--- render/process.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/render/host.go b/render/host.go index 8ce144d0a..f3c708458 100644 --- a/render/host.go +++ b/render/host.go @@ -67,11 +67,11 @@ type endpoints2Hosts struct { } func (e endpoints2Hosts) Render(rpt report.Report, dct Decorator) report.Nodes { - ns := SelectEndpoint.Render(rpt, dct) local := LocalNetworks(rpt) + endpoints := SelectEndpoint.Render(rpt, dct) ret := newJoinResults() - for _, n := range ns { + for _, n := range endpoints { // Nodes without a hostid are treated as pseudo nodes hostNodeID, timestamp, ok := n.Latest.LookupEntry(report.HostNodeID) if !ok { @@ -88,7 +88,7 @@ func (e endpoints2Hosts) Render(rpt report.Report, dct Decorator) report.Nodes { }) } } - ret.fixupAdjacencies(ns) + ret.fixupAdjacencies(endpoints) return ret.nodes } diff --git a/render/process.go b/render/process.go index f42db7c0a..54d4a14b6 100644 --- a/render/process.go +++ b/render/process.go @@ -90,9 +90,9 @@ func (e endpoints2Processes) Render(rpt report.Report, dct Decorator) report.Nod if len(rpt.Process.Nodes) == 0 { return report.Nodes{} } + local := LocalNetworks(rpt) processes := SelectProcess.Render(rpt, dct) endpoints := SelectEndpoint.Render(rpt, dct) - local := LocalNetworks(rpt) ret := newJoinResults() for _, n := range endpoints {