diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/pod.go | 9 | ||||
| -rw-r--r-- | libpod/pod_ffjson.go | 2 | ||||
| -rw-r--r-- | libpod/stats.go | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libpod/pod.go b/libpod/pod.go index e5d491e52..666480aa8 100644 --- a/libpod/pod.go +++ b/libpod/pod.go @@ -4,6 +4,7 @@ import ( "time" "github.com/containers/storage" + "github.com/pkg/errors" ) // Pod represents a group of containers that are managed together. @@ -192,10 +193,14 @@ func (p *Pod) GetPodStats(previousContainerStats map[string]*ContainerStats) (ma prevStat = &ContainerStats{} } newStats, err := c.GetContainerStats(prevStat) - if err != nil { + // If the container wasn't running, don't include it + // but also suppress the error + if err != nil && errors.Cause(err) != ErrCtrStateInvalid { return nil, err } - newContainerStats[c.ID()] = newStats + if err == nil { + newContainerStats[c.ID()] = newStats + } } return newContainerStats, nil } diff --git a/libpod/pod_ffjson.go b/libpod/pod_ffjson.go index a74c91ccc..36b1cf08f 100644 --- a/libpod/pod_ffjson.go +++ b/libpod/pod_ffjson.go @@ -1,5 +1,5 @@ // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT. -// source: libpod/pod.go +// source: /home/pehunt/go/src/github.com/containers/libpod/libpod/pod.go package libpod diff --git a/libpod/stats.go b/libpod/stats.go index 61e85ed5e..9d5efd993 100644 --- a/libpod/stats.go +++ b/libpod/stats.go @@ -26,7 +26,7 @@ func (c *Container) GetContainerStats(previousStats *ContainerStats) (*Container } if c.state.State != ContainerStateRunning { - return stats, nil + return stats, ErrCtrStateInvalid } cgroupPath, err := c.CGroupPath() |