1. docker
  2. Commit 98b155379bdca9a9c0e590945fb2500bb2c823a8
Browse code

Fix panic when meminfo couldn't be read

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6)
Signed-off-by: Tibor Vass <tibor@docker.com>

Brian Goff authored on 2016/07/13 04:30:21
Showing 1 changed files
daemon/info.go
History View file @ 98b1553
... ... 
@@ -51,6 +51,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
51 51 
 	meminfo, err := system.ReadMemInfo()
52 52 
 	if err != nil {
53 53 
 		logrus.Errorf("Could not read system memory info: %v", err)
54 
+		meminfo = &system.MemInfo{}
54 55 
 	}
55 56
56 57 
 	sysInfo := sysinfo.New(true)