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

Use the "name" set for the connection details

Browse Source
This commit is contained in:
Alvaro Saurin
2015-11-09 13:44:26 +01:00
parent bc972a52ab
commit 82d9e35da6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
render/detailed_node.go
View File

@@ -210,10 +210,10 @@ func OriginTable(r report.Report, originID string, addHostTags bool, addContaine
func connectionDetailsRows(topology report.Topology, originID string) []Row {
rows := []Row{}
labeler := func(nodeID string, meta map[string]string) (string, bool) {
labeler := func(nodeID string, sets report.Sets) (string, bool) {
if _, addr, port, ok := report.ParseEndpointNodeID(nodeID); ok {
if name, ok := meta["name"]; ok {
return fmt.Sprintf("%s:%s", name, port), true
if names, ok := sets["name"]; ok {
return fmt.Sprintf("%s:%s", names[0], port), true
}
return fmt.Sprintf("%s:%s", addr, port), true
}
@@ -222,13 +222,13 @@ func connectionDetailsRows(topology report.Topology, originID string) []Row {
}
return "", false
}
local, ok := labeler(originID, topology.Nodes[originID].Metadata)
local, ok := labeler(originID, topology.Nodes[originID].Sets)
if !ok {
return rows
}
// Firstly, collection outgoing connections from this node.
for _, serverNodeID := range topology.Nodes[originID].Adjacency {
remote, ok := labeler(serverNodeID, topology.Nodes[serverNodeID].Metadata)
remote, ok := labeler(serverNodeID, topology.Nodes[serverNodeID].Sets)
if !ok {
continue
}
@@ -247,7 +247,7 @@ func connectionDetailsRows(topology report.Topology, originID string) []Row {
if !serverNodeIDs.Contains(originID) {
continue
}
remote, ok := labeler(clientNodeID, clientNode.Metadata)
remote, ok := labeler(clientNodeID, clientNode.Sets)
if !ok {
continue
}