From b0fb0f19934287f428d14d1267183fe9194a4fdf Mon Sep 17 00:00:00 2001 From: allencloud Date: Fri, 11 Mar 2016 23:08:25 +0800 Subject: [PATCH] handle kernel and os info error in /info api Signed-off-by: allencloud --- daemon/info.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/info.go b/daemon/info.go index f3c753b959..2750447ce7 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -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 := "" - 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 := "" - 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 }