From cc859926ef0fb7a2b9e48f026583618183067dbb Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sun, 17 Dec 2017 15:36:28 +0000 Subject: [PATCH] tiny simplifying refactor --- render/host.go | 9 +++------ render/process.go | 13 +++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/render/host.go b/render/host.go index 3d7ceccbc..93a2c1ad6 100644 --- a/render/host.go +++ b/render/host.go @@ -56,13 +56,10 @@ func (e endpoints2Hosts) Render(rpt report.Report) Nodes { for _, n := range endpoints.Nodes { // Nodes without a hostid are treated as pseudo nodes - hostNodeID, timestamp, ok := n.Latest.LookupEntry(report.HostNodeID) - if !ok { - id, ok := pseudoNodeID(n, local) - if !ok { - continue + if hostNodeID, timestamp, ok := n.Latest.LookupEntry(report.HostNodeID); !ok { + if id, ok := pseudoNodeID(n, local); ok { + ret.addChild(n, id, newPseudoNode) } - ret.addChild(n, id, newPseudoNode) } else { id := report.MakeHostNodeID(report.ExtractHostID(n)) ret.addChild(n, id, func(id string) report.Node { diff --git a/render/process.go b/render/process.go index bb285957d..a4f2fdef2 100644 --- a/render/process.go +++ b/render/process.go @@ -155,14 +155,11 @@ func processes2Names(processes Nodes) Nodes { for _, n := range processes.Nodes { if n.Topology == Pseudo { ret.passThrough(n) - } else { - name, timestamp, ok := n.Latest.LookupEntry(process.Name) - if ok { - ret.addChildAndChildren(n, name, func(id string) report.Node { - return report.MakeNode(id).WithTopology(MakeGroupNodeTopology(n.Topology, process.Name)). - WithLatest(process.Name, timestamp, name) - }) - } + } else if name, timestamp, ok := n.Latest.LookupEntry(process.Name); ok { + ret.addChildAndChildren(n, name, func(id string) report.Node { + return report.MakeNode(id).WithTopology(MakeGroupNodeTopology(n.Topology, process.Name)). + WithLatest(process.Name, timestamp, name) + }) } } ret.fixupAdjacencies(processes)