kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-09 03:45:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2288 from hashicorp/b-lower-hostid

Browse Source 
Lowercase NodeID
This commit is contained in:
Alex Dadgar
2017-02-06 16:26:04 -08:00
committed by GitHub
parent 55da5c16e1 c3c44d27fc
commit 8d189a5dcc
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@@ -666,7 +666,7 @@ func (c *Client) nodeID() (id, secret string, err error) {
// Use existing ID if any
if len(idBuf) != 0 {
id = string(idBuf)
id = strings.ToLower(string(idBuf))
} else {
id = hostID

2
vendor/github.com/shirou/gopsutil/host/host_darwin.go generated vendored
View File

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

2
vendor/github.com/shirou/gopsutil/host/host_freebsd.go generated vendored
View File

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

4
vendor/github.com/shirou/gopsutil/host/host_linux.go generated vendored
View File

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

2
vendor/github.com/shirou/gopsutil/host/host_windows.go generated vendored
View File

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

6
vendor/vendor.json vendored
View File

@@ -999,10 +999,10 @@
"revisionTime": "2017-02-04T05:36:48Z"
},
{
"checksumSHA1": "j5cGmi4mFeXmsLpSTiakU/k7aOc=",
"checksumSHA1": "GsqEEmGv6sj8DreS2SYXRkoZ9NI=",
"path": "github.com/shirou/gopsutil/host",
"revision": "32b6636de04b303274daac3ca2b10d3b0e4afc35",
"revisionTime": "2017-02-04T05:36:48Z"
"revision": "36f5033d9787f85e97cc259fcb33bd699f3dbe0f",
"revisionTime": "2017-02-07T00:10:46Z"
},
{
"checksumSHA1": "hz9RxkaV3Tnju2eiHBWO/Yv7n5c=",