Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info

handle error when getting hostname in info api
Upstream-commit: e16753ce192cc80d3e207d7b3063a9dab36983cb
Component: engine
This commit is contained in:
Alexander Morozov
2016-05-09 14:57:36 -07:00
+6 -2
View File
@@ -133,9 +133,13 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
v.CPUSet = sysInfo.Cpuset
}
if hostname, err := os.Hostname(); err == nil {
v.Name = hostname
hostname := ""
if hn, err := os.Hostname(); err != nil {
logrus.Warnf("Could not get hostname: %v", err)
} else {
hostname = hn
}
v.Name = hostname
return v, nil
}