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

refactor: rename ShortLivedConnectionJoin to ConnectionJoin

Browse Source 
since it's dealing with *all* connections, not just short-lived ones.
This commit is contained in:
Matthias Radestock
2017-06-03 10:46:52 +01:00
parent 9bc7b30f0f
commit ebcf9dcf10
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
render/container.go
View File

@@ -34,11 +34,11 @@ var ContainerRenderer = MakeFilter(
ProcessRenderer,
),
// This mapper brings in short lived connections by joining with container IPs.
// We need to be careful to ensure we only include each edge once. Edges brought in
// by the above renders will have a pid, so its enough to filter out any nodes with
// pids.
ShortLivedConnectionJoin(SelectContainer, MapContainer2IP),
// This mapper brings in connections by joining with container
// IPs. We need to be careful to ensure we only include each
// edge once. Edges brought in by the above renders will have
// a pid, so its enough to filter out any nodes with pids.
ConnectionJoin(SelectContainer, MapContainer2IP),
SelectContainer,
),
@@ -55,10 +55,10 @@ var mapEndpoint2IP = MakeMap(
const originalNodeID = "original_node_id"
const originalNodeTopology = "original_node_topology"
// ShortLivedConnectionJoin joins the given renderer with short lived connections
// from the endpoints topology, using the toIPs function to extract IPs from
// ConnectionJoin joins the given renderer with connections from the
// endpoints topology, using the toIPs function to extract IPs from
// the nodes.
func ShortLivedConnectionJoin(r Renderer, toIPs func(report.Node) []string) Renderer {
func ConnectionJoin(r Renderer, toIPs func(report.Node) []string) Renderer {
nodeToIP := func(n report.Node, _ report.Networks) report.Nodes {
result := report.Nodes{}
for _, ip := range toIPs(n) {

2
render/pod.go
View File

@@ -44,7 +44,7 @@ var PodRenderer = ConditionalRenderer(renderKubernetesTopologies,
ContainerWithImageNameRenderer,
),
),
ShortLivedConnectionJoin(SelectPod, MapPod2IP),
ConnectionJoin(SelectPod, MapPod2IP),
SelectPod,
),
),