浏览代码

Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api

handle kernel version error in version api
Vincent Demeester 9 年之前
父节点
当前提交
ea0025a7e1
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      daemon/info.go

+ 6 - 2
daemon/info.go

@@ -141,9 +141,13 @@ func (daemon *Daemon) SystemVersion() types.Version {
 		Experimental: utils.ExperimentalBuild(),
 	}
 
-	if kernelVersion, err := kernel.GetKernelVersion(); err == nil {
-		v.KernelVersion = kernelVersion.String()
+	kernelVersion := "<unknown>"
+	if kv, err := kernel.GetKernelVersion(); err != nil {
+		logrus.Warnf("Could not get kernel version: %v", err)
+	} else {
+		kernelVersion = kv.String()
 	}
+	v.KernelVersion = kernelVersion
 
 	return v
 }