toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21128 from allencloud/handle-kernel-and-os-error-in-info-api

Browse Source 
handle kernel and os info error in /info api
Upstream-commit: db182507c1153b0ed3b0d30d4f41ab4ad8050882
Component: engine
This commit is contained in:
David Calavera
2016-03-15 14:42:57 -07:00
parent 03bd4af0a6 e310757018
commit f29a1e7874
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/daemon/info.go
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
}