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

client: PR cleanup - shadow context variable

Browse Source
This commit is contained in:
Seth Hoenig
2020-01-30 12:59:04 -06:00
parent 0589b656b7
commit f8949dde35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/allocrunner/taskrunner/sids_hook.go
View File

@@ -181,13 +181,13 @@ type siDerivationResult struct {
// derive an SI token until a token is successfully created, or ctx is signaled
// done.
func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) {
ctx2, cancel := context.WithTimeout(ctx, h.derivationTimeout)
ctx, cancel := context.WithTimeout(ctx, h.derivationTimeout)
defer cancel()
resultCh := make(chan siDerivationResult)
// keep trying to get the token in the background
go h.tryDerive(ctx2, resultCh)
go h.tryDerive(ctx, resultCh)
// wait until we get a token, or we get a signal to quit
for {
@@ -198,8 +198,8 @@ func (h *sidsHook) deriveSIToken(ctx context.Context) (string, error) {
return "", result.err
}
return result.token, nil
case <-ctx2.Done():
return "", ctx2.Err()
case <-ctx.Done():
return "", ctx.Err()
}
}
}