OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #313 from sean-/lowercase-hostid 

Unconditionally lowercase the `HostID` from all supported platforms.
This commit is contained in:
shirou 2017-02-08 11:55:55 +09:00 committed by GitHub
parent 32b6636de0 36f5033d97
commit b62e301a8b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/host_darwin.go
View File

@ -59,7 +59,7 @@ func Info() (*InfoStat, error) {
values, err := common.DoSysctrl("kern.uuid") values, err := common.DoSysctrl("kern.uuid")
if err == nil && len(values) == 1 && values[0] != "" { if err == nil && len(values) == 1 && values[0] != "" {
ret.HostID = values[0] ret.HostID = strings.ToLower(values[0])
} }
return ret, nil return ret, nil

2
host/host_freebsd.go
View File

@ -62,7 +62,7 @@ func Info() (*InfoStat, error) {
values, err := common.DoSysctrl("kern.hostuuid") values, err := common.DoSysctrl("kern.hostuuid")
if err == nil && len(values) == 1 && values[0] != "" { if err == nil && len(values) == 1 && values[0] != "" {
ret.HostID = values[0] ret.HostID = strings.ToLower(values[0])
} }
return ret, nil return ret, nil

4
host/host_linux.go
View File

@ -70,14 +70,14 @@ func Info() (*InfoStat, error) {
case common.PathExists(sysProductUUID): case common.PathExists(sysProductUUID):
lines, err := common.ReadLines(sysProductUUID) lines, err := common.ReadLines(sysProductUUID)
if err == nil && len(lines) > 0 && lines[0] != "" { if err == nil && len(lines) > 0 && lines[0] != "" {
ret.HostID = lines[0] ret.HostID = strings.ToLower(lines[0])
break break
} }
fallthrough fallthrough
default: default:
values, err := common.DoSysctrl("kernel.random.boot_id") values, err := common.DoSysctrl("kernel.random.boot_id")
if err == nil && len(values) == 1 && values[0] != "" { if err == nil && len(values) == 1 && values[0] != "" {
ret.HostID = values[0] ret.HostID = strings.ToLower(values[0])
} }
} }

2
host/host_windows.go
View File

@ -64,7 +64,7 @@ func Info() (*InfoStat, error) {
{ {
hostID, err := getMachineGuid() hostID, err := getMachineGuid()
if err == nil { if err == nil {
ret.HostID = hostID ret.HostID = strings.ToLower(hostID)
} }
} }