Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion container/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
4 changes: 4 additions & 0 deletions container/libcontainer/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down