mirror/groupcache
1
0
Fork 0
mirror of https://github.com/mailgun/groupcache.git synced 2024-07-01 02:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

http requests now respect context.Context done

Browse Source
This commit is contained in:
Derrick J. Wippler 2019-05-30 16:47:38 -05:00
parent 9dade9087a
commit a5eee224aa
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
http.go
View File

@ -18,6 +18,7 @@ package groupcache
import (
"bytes"
"context"
"fmt"
"io"
"io/ioutil"
@ -223,7 +224,7 @@ var bufferPool = sync.Pool{
New: func() interface{} { return new(bytes.Buffer) },
}
func (h *httpGetter) makeRequest(context Context, method string, in *pb.GetRequest, out *http.Response) error {
func (h *httpGetter) makeRequest(ctx Context, method string, in *pb.GetRequest, out *http.Response) error {
u := fmt.Sprintf(
"%v%v/%v",
h.baseURL,
@ -234,9 +235,15 @@ func (h *httpGetter) makeRequest(context Context, method string, in *pb.GetReque
if err != nil {
return err
}
// If user passed a standard context object, use it in the request.
if stdCtx, ok := ctx.(context.Context); ok {
req = req.WithContext(stdCtx)
}
tr := http.DefaultTransport
if h.transport != nil {
tr = h.transport(context)
tr = h.transport(ctx)
}
res, err := tr.RoundTrip(req)
if err != nil {