handle kernel and os info error in /info api

Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b0fb0f19934287f428d14d1267183fe9194a4fdf
Component: engine
This commit is contained in:
allencloud
2016-03-15 20:23:15 +08:00
parent a1a5012791
commit e310757018
+6 -2
View File
@@ -26,12 +26,16 @@ import (
// SystemInfo returns information about the host server the daemon is running on.
func (daemon *Daemon) SystemInfo() (*types.Info, error) {
kernelVersion := "<unknown>"
if kv, err := kernel.GetKernelVersion(); err == nil {
if kv, err := kernel.GetKernelVersion(); err != nil {
logrus.Warnf("Could not get kernel version: %v", err)
} else {
kernelVersion = kv.String()
}
operatingSystem := "<unknown>"
if s, err := operatingsystem.GetOperatingSystem(); err == nil {
if s, err := operatingsystem.GetOperatingSystem(); err != nil {
logrus.Warnf("Could not get operating system name: %v", err)
} else {
operatingSystem = s
}