mirror of
https://github.com/mailgun/groupcache.git
synced 2024-11-16 14:10:04 +00:00
Merge pull request #32 from develar/http-with-context
simplify code — use NewRequestWithContext API to create request
This commit is contained in:
commit
144bfc1a6e
@ -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:
|
||||
|
5
http.go
5
http.go
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user