Code review: improve consistency of naming and ordering

weaveworks · Nov 6, 2017 · ec0689b · ec0689b
1 parent 4feb451
commit ec0689b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 {