github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1248 from weaveworks/1247-no-blank-connection-ports

Browse Source 
better detection of endpoint children, to avoid including MapX2IP results
This commit is contained in:
Tom Wilkie
2016-04-07 16:41:20 +01:00
parent 201c290503 ba83927db0
commit 27800ff79a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
render/detailed/connections.go
View File

@@ -137,7 +137,7 @@ func outgoingConnectionsTable(topologyID string, n report.Node, ns report.Nodes)
func endpointChildrenOf(n report.Node) []report.Node {
result := []report.Node{}
n.Children.ForEach(func(child report.Node) {
if _, _, _, ok := report.ParseEndpointNodeID(child.ID); ok {
if child.Topology == report.Endpoint {
result = append(result, child)
}
})
@@ -147,7 +147,7 @@ func endpointChildrenOf(n report.Node) []report.Node {
func endpointChildIDsOf(n report.Node) report.IDList {
result := report.MakeIDList()
n.Children.ForEach(func(child report.Node) {
if _, _, _, ok := report.ParseEndpointNodeID(child.ID); ok {
if child.Topology == report.Endpoint {
result = result.Add(child.ID)
}
})