kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

daemon/info.go: remove check for map nilness 

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-11-10 09:20:59 -08:00
parent a6a3c42b58
commit 8f311f4d8c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/info.go
View File

@ -19,13 +19,6 @@ import (
// SystemInfo returns information about the host server the daemon is running on. // SystemInfo returns information about the host server the daemon is running on.
func (daemon *Daemon) SystemInfo() (*types.Info, error) { func (daemon *Daemon) SystemInfo() (*types.Info, error) {
images := daemon.Graph().Map()
var imgcount int
if images == nil {
imgcount = 0
} else {
imgcount = len(images)
}
kernelVersion := "<unknown>" kernelVersion := "<unknown>"
if kv, err := kernel.GetKernelVersion(); err == nil { if kv, err := kernel.GetKernelVersion(); err == nil {
kernelVersion = kv.String() kernelVersion = kv.String()
@ -66,7 +59,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
v := &types.Info{ v := &types.Info{
ID: daemon.ID, ID: daemon.ID,
Containers: len(daemon.List()), Containers: len(daemon.List()),
Images: imgcount, Images: len(daemon.Graph().Map()),
Driver: daemon.GraphDriver().String(), Driver: daemon.GraphDriver().String(),
DriverStatus: daemon.GraphDriver().Status(), DriverStatus: daemon.GraphDriver().Status(),
IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled, IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled,