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

handle the upgrade case

Browse Source
This commit is contained in:
Alex Dadgar
2016-08-18 19:01:24 -07:00
parent ba51037fd6
commit 1cafd04c94
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/client.go
View File

@@ -509,21 +509,30 @@ func (c *Client) nodeID() (id string, secret string, err error) {
}
// Use existing ID if any
if len(idBuf) != 0 && len(secretBuf) != 0 {
return string(idBuf), string(secretBuf), nil
if len(idBuf) != 0 {
id = string(idBuf)
} else {
// Generate new ID
id = structs.GenerateUUID()
// Persist the ID
if err := ioutil.WriteFile(idPath, []byte(id), 0700); err != nil {
return "", "", err
}
}
// Generate new ID
id = structs.GenerateUUID()
secret = structs.GenerateUUID()
if len(secretBuf) != 0 {
secret = string(secretBuf)
} else {
// Generate new ID
secret = structs.GenerateUUID()
// Persist the IDs
if err := ioutil.WriteFile(idPath, []byte(id), 0700); err != nil {
return "", "", err
}
if err := ioutil.WriteFile(secretPath, []byte(secret), 0700); err != nil {
return "", "", err
// Persist the ID
if err := ioutil.WriteFile(secretPath, []byte(secret), 0700); err != nil {
return "", "", err
}
}
return id, secret, nil
}