scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert change suggested by vet. See the comment for details. (#7815)

Browse Source
This commit is contained in:
Jeff Mitchell
2019-11-06 17:03:37 -05:00
committed by GitHub
parent 3fa86f3efe
commit 50c4161d83
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/client.go
View File

@@ -790,10 +790,15 @@ START:
return nil, LastOutputStringError return nil, LastOutputStringError
} }
var cancel context.CancelFunc
if timeout != 0 { if timeout != 0 {
ctx, cancel = context.WithTimeout(ctx, timeout) // NOTE: this leaks a timer. But when we defer a cancel call here for
defer cancel() // the returned function we see errors in tests with contxt canceled.
// Although the request is done by the time we exit this function it is
// still causing something else to go wrong. Maybe it ends up being
// tied to the response somehow and reading the response body ends up
// checking it, or something. I don't know, but until we can chase this
// down, keep it not-canceled even though vet complains.
ctx, _ = context.WithTimeout(ctx, timeout)
} }
req.Request = req.Request.WithContext(ctx) req.Request = req.Request.WithContext(ctx)