simplify code — use NewRequestWithContext API to create request

This commit is contained in:
develar 2021-09-22 13:23:33 +02:00
parent 2fc526bccc
commit a6ecc9438e
2 changed files with 3 additions and 8 deletions

View File

@ -2,19 +2,17 @@ language: go
go_import_path: github.com/mailgun/groupcache
os: linux
dist: trusty
dist: xenial
sudo: false
script:
- go test ./...
go:
- 1.10.x
- 1.11.x
- 1.12.x
- 1.13.x
- 1.14.x
- 1.15.x
- 1.17.x
- master
cache:

View File

@ -241,14 +241,11 @@ func (h *httpGetter) makeRequest(ctx context.Context, method string, in *pb.GetR
url.QueryEscape(in.GetGroup()),
url.QueryEscape(in.GetKey()),
)
req, err := http.NewRequest(method, u, nil)
req, err := http.NewRequestWithContext(ctx, method, u, nil)
if err != nil {
return err
}
// Pass along the context to the RoundTripper
req = req.WithContext(ctx)
tr := http.DefaultTransport
if h.getTransport != nil {
tr = h.getTransport(ctx)