github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize var names; use Addr/Port key constants

Browse Source
This commit is contained in:
Peter Bourgon
2015-07-30 11:34:10 +02:00
parent a565acc871
commit fc308d93b8
6 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
render/detailed_node.go
View File

@@ -6,6 +6,7 @@ import (
"strconv"
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/endpoint"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/report"
@@ -125,7 +126,7 @@ func OriginTable(r report.Report, originID string) (Table, bool) {
func connectionDetailsRows(endpointTopology report.Topology, originID string, nmd report.NodeMetadata) []Row {
rows := []Row{}
local := fmt.Sprintf("%s:%s", nmd.Metadata[docker.Addr], nmd.Metadata[docker.Port])
local := fmt.Sprintf("%s:%s", nmd.Metadata[endpoint.Addr], nmd.Metadata[endpoint.Port])
adjacencies := endpointTopology.Adjacency[report.MakeAdjacencyID(originID)]
sort.Strings(adjacencies)
for _, adj := range adjacencies {
@@ -150,7 +151,7 @@ func connectionDetailsTable(connectionRows []Row) Table {
func addressOriginTable(nmd report.NodeMetadata) (Table, bool) {
rows := []Row{}
if val, ok := nmd.Metadata["addr"]; ok {
if val, ok := nmd.Metadata[endpoint.Addr]; ok {
rows = append(rows, Row{"Address", val, ""})
}
return Table{

18
render/mapping.go
View File

@@ -6,7 +6,9 @@ import (
"strings"
"github.com/weaveworks/scope/probe/docker"
"github.com/weaveworks/scope/probe/endpoint"
"github.com/weaveworks/scope/probe/host"
"github.com/weaveworks/scope/probe/process"
"github.com/weaveworks/scope/report"
)
@@ -49,9 +51,9 @@ type MapFunc func(RenderableNode) (RenderableNode, bool)
// assume the presence of certain keys.
func MapEndpointIdentity(m report.NodeMetadata) (RenderableNode, bool) {
var (
id = MakeEndpointID(report.ExtractHostID(m), m.Metadata["addr"], m.Metadata["port"])
major = fmt.Sprintf("%s:%s", m.Metadata["addr"], m.Metadata["port"])
pid, ok = m.Metadata["pid"]
id = MakeEndpointID(report.ExtractHostID(m), m.Metadata[endpoint.Addr], m.Metadata[endpoint.Port])
major = fmt.Sprintf("%s:%s", m.Metadata[endpoint.Addr], m.Metadata[endpoint.Port])
pid, ok = m.Metadata[process.PID]
minor = report.ExtractHostID(m)
rank = major
)
@@ -68,9 +70,9 @@ func MapEndpointIdentity(m report.NodeMetadata) (RenderableNode, bool) {
// presence of certain keys.
func MapProcessIdentity(m report.NodeMetadata) (RenderableNode, bool) {
var (
id = MakeProcessID(report.ExtractHostID(m), m.Metadata["pid"])
id = MakeProcessID(report.ExtractHostID(m), m.Metadata[process.PID])
major = m.Metadata["comm"]
minor = fmt.Sprintf("%s (%s)", report.ExtractHostID(m), m.Metadata["pid"])
minor = fmt.Sprintf("%s (%s)", report.ExtractHostID(m), m.Metadata[process.PID])
rank = m.Metadata["comm"]
)
@@ -109,8 +111,8 @@ func MapContainerImageIdentity(m report.NodeMetadata) (RenderableNode, bool) {
// assume the presence of certain keys.
func MapAddressIdentity(m report.NodeMetadata) (RenderableNode, bool) {
var (
id = MakeAddressID(report.ExtractHostID(m), m.Metadata["addr"])
major = m.Metadata["addr"]
id = MakeAddressID(report.ExtractHostID(m), m.Metadata[endpoint.Addr])
major = m.Metadata[endpoint.Addr]
minor = report.ExtractHostID(m)
rank = major
)
@@ -154,7 +156,7 @@ func MapEndpoint2Process(n RenderableNode) (RenderableNode, bool) {
return n, true
}
pid, ok := n.NodeMetadata.Metadata["pid"]
pid, ok := n.NodeMetadata.Metadata[process.PID]
if !ok {
return RenderableNode{}, false
}