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

Merge pull request #341 from vmarmol/err

Browse Source 
Report error while fetching network stats.
This commit is contained in:
Vish Kannan 2014-12-10 13:38:15 -08:00
commit 5064ad463f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container/factory.go
View File

@ -60,8 +60,10 @@ func NewContainerHandler(name string) (ContainerHandler, error) {
glog.V(1).Infof("Error trying to work out if we can hande %s: %v", name, err) glog.V(1).Infof("Error trying to work out if we can hande %s: %v", name, err)
} }
if canHandle { if canHandle {
glog.V(1).Infof("Using factory %q for container %q", factory.String(), name) glog.V(1).Infof("Using factory %q for container %q", factory, name)
return factory.NewContainerHandler(name) return factory.NewContainerHandler(name)
} else {
glog.V(1).Infof("Factory %q was unable to handle container %q", factory, name)
} }
} }

4
container/libcontainer/helpers.go
View File

@ -36,6 +36,10 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe
} }
stats.NetworkStats, err = network.GetStats(&state.NetworkState) stats.NetworkStats, err = network.GetStats(&state.NetworkState)
if err != nil {
return &info.ContainerStats{}, err
}
return toContainerStats(stats), nil return toContainerStats(stats), nil
} }