opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

Directly wire ctx into http request

Browse Source 
License: MIT
Signed-off-by: rht <rhtbot@gmail.com>
This commit is contained in:
rht
2016-01-30 10:19:27 +07:00
parent f631db7e69
commit 45999946be
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
commands/http/client.go
View File

@ -34,7 +34,7 @@ type Client interface {
type client struct {
serverAddress string
httpClient http.Client
httpClient *http.Client
}
func NewClient(address string) Client {
@ -43,7 +43,7 @@ func NewClient(address string) Client {
// refused on 'client.Do'
return &client{
serverAddress: address,
httpClient: http.Client{
httpClient: &http.Client{
Transport: &http.Transport{
DisableKeepAlives: true,
},
@ -103,7 +103,7 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
ec := make(chan error, 1)
rc := make(chan cmds.Response, 1)
dc := req.Context().Done()
httpReq.Cancel = req.Context().Done()
go func() {
httpRes, err := c.httpClient.Do(httpReq)
@ -122,24 +122,17 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
rc <- res
}()
for {
select {
case <-dc:
log.Debug("Context cancelled, cancelling HTTP request...")
tr := http.DefaultTransport.(*http.Transport)
tr.CancelRequest(httpReq)
dc = nil // Wait for ec or rc
case err := <-ec:
return nil, err
case res := <-rc:
if found && len(previousUserProvidedEncoding) > 0 {
// reset to user provided encoding after sending request
// NB: if user has provided an encoding but it is the empty string,
// still leave it as JSON.
req.SetOption(cmds.EncShort, previousUserProvidedEncoding)
}
return res, nil
select {
case err := <-ec:
return nil, err
case res := <-rc:
if found && len(previousUserProvidedEncoding) > 0 {
// reset to user provided encoding after sending request
// NB: if user has provided an encoding but it is the empty string,
// still leave it as JSON.
req.SetOption(cmds.EncShort, previousUserProvidedEncoding)
}
return res, nil
}
}