prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some more renames

Browse Source
This commit is contained in:
Abin Shahab 2014-10-14 23:19:46 +00:00
parent 4c740cbc54
commit 9264114895
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container/raw/container_hints.go
View File

@ -29,7 +29,7 @@ type containerHints struct {
} }
type containerHint struct { type containerHint struct {
FullPath string `json:"full_path,omitempty"` FullName string `json:"full_path,omitempty"`
NetworkInterface *networkInterface `json:"network_interface,omitempty"` NetworkInterface *networkInterface `json:"network_interface,omitempty"`
} }

7
container/raw/handler.go
View File

@ -54,14 +54,11 @@ func newRawContainerHandler(name string, cgroupSubsystems *cgroupSubsystems, mac
} }
cHints, err := getContainerHintsFromFile(*argContainerHints) cHints, err := getContainerHintsFromFile(*argContainerHints)
if err != nil { if err != nil {
glog.Fatalf("Error unmarshalling json %s Error: %s", *argContainerHints, err) return nil, err
} }
var networkInterface *networkInterface var networkInterface *networkInterface
for _, container := range cHints.AllHosts { for _, container := range cHints.AllHosts {
if !strings.Contains(container.FullPath, "/") { if name == container.FullName {
glog.Fatalf("Invalid container fullPath %s", container.FullPath)
}
if name == container.FullPath {
networkInterface = container.NetworkInterface networkInterface = container.NetworkInterface
break break
} }