GitList

Browse code

handle error when getting hostname in info api

Signed-off-by: allencloud <allen.sun@daocloud.io>

allencloud authored on 2016/05/03 16:26:32
Showing 1 changed files

daemon/info.go index 9ef74d2..433f924 100644

@@ -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
 }

...	...	@@ -133,9 +133,13 @@ func (daemon Daemon) SystemInfo() (types.Info, error) {
133	133	v.CPUSet = sysInfo.Cpuset
134	134	}
135	135
136		- if hostname, err := os.Hostname(); err == nil {
137		- v.Name = hostname
	136	+ hostname := ""
	137	+ if hn, err := os.Hostname(); err != nil {
	138	+ logrus.Warnf("Could not get hostname: %v", err)
	139	+ } else {
	140	+ hostname = hn
138	141	}
	142	+ v.Name = hostname
139	143
140	144	return v, nil
141	145	}