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

Third time is a charm.

Browse Source
This commit is contained in:
Brad Sickles
2017-02-01 16:18:12 -05:00
parent 5326ad3f3f
commit 57c9ff377d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nomad/node_endpoint.go
View File

@@ -944,9 +944,8 @@ func (n *Node) DeriveVaultToken(args *structs.DeriveVaultTokenRequest,
// setErr is a helper for setting the recoverable error on the reply and
// logging it
setErr := func(e error, recoverable bool) {
if rerr, ok := structs.NewRecoverableError(e, recoverable).(*structs.RecoverableError); ok {
reply.Error = rerr
}
if e == nil { return }
reply.Error = structs.NewRecoverableError(e, recoverable).(*structs.RecoverableError)
n.srv.logger.Printf("[ERR] nomad.client: DeriveVaultToken failed (recoverable %v): %v", recoverable, e)
}
@@ -1135,8 +1134,8 @@ func (n *Node) DeriveVaultToken(args *structs.DeriveVaultTokenRequest,
if rerr, ok := createErr.(*structs.RecoverableError); ok {
reply.Error = rerr
} else if rerr, ok = structs.NewRecoverableError(createErr, false).(*structs.RecoverableError); ok {
reply.Error = rerr
} else if err != nil {
reply.Error = structs.NewRecoverableError(createErr, false).(*structs.RecoverableError)
}
return nil