浏览代码

Merge pull request #24549 from cpuguy83/fix_nil_meminfo

Fix panic when meminfo couldn't be read
Vincent Demeester 9 年之前
父节点
当前提交
534c3e328f
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      daemon/info.go

+ 1 - 0
daemon/info.go

@@ -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)