Merge pull request #37472 from thaJeztah/no_unknown

Do not return "<unknown>" in /info response
Upstream-commit: 0a4f89566a22a07427d850a8d70f264210062da0
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2018-08-16 14:56:31 +02:00
committed by GitHub
3 changed files with 17 additions and 2 deletions
+2 -2
View File
@@ -179,7 +179,7 @@ func hostName() string {
}
func kernelVersion() string {
kernelVersion := "<unknown>"
var kernelVersion string
if kv, err := kernel.GetKernelVersion(); err != nil {
logrus.Warnf("Could not get kernel version: %v", err)
} else {
@@ -198,7 +198,7 @@ func memInfo() *system.MemInfo {
}
func operatingSystem() string {
operatingSystem := "<unknown>"
var operatingSystem string
if s, err := operatingsystem.GetOperatingSystem(); err != nil {
logrus.Warnf("Could not get operating system name: %v", err)
} else {