From ff9a4995a1a7b9544765928f4e35831f31e74649 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Tue, 9 Dec 2014 14:22:12 -0800 Subject: [PATCH] Report error while fetching network stats. --- container/factory.go | 4 +++- container/libcontainer/helpers.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/container/factory.go b/container/factory.go index e49bca332e..520da9e9bf 100644 --- a/container/factory.go +++ b/container/factory.go @@ -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) } 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) + } else { + glog.V(1).Infof("Factory %q was unable to handle container %q", factory, name) } } diff --git a/container/libcontainer/helpers.go b/container/libcontainer/helpers.go index 2d28e6f12b..77ed030b1b 100644 --- a/container/libcontainer/helpers.go +++ b/container/libcontainer/helpers.go @@ -36,6 +36,10 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe } stats.NetworkStats, err = network.GetStats(&state.NetworkState) + if err != nil { + return &info.ContainerStats{}, err + } + return toContainerStats(stats), nil }