0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix panic when meminfo couldn't be read

Browse source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5f7b1b604c)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Brian Goff 2016-07-12 15:30:21 -04:00 • committed by Tibor Vass
parent 9a0e0cccfe
commit 98b155379b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
daemon/info.go
View file

@ -51,6 +51,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
meminfo, err := system.ReadMemInfo()
if err != nil {
logrus.Errorf("Could not read system memory info: %v", err)
meminfo = &system.MemInfo{}
}
sysInfo := sysinfo.New(true)