Skip to content

Use Request context for HTTPClient.Do #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klauspost wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use Request context for HTTPClient.Do #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f1b88
Use Request context for HTTPClient.Do
klauspost Mar 15, 2018
1d96186
Don't break on deadline exceeded.
klauspost Sep 25, 2018
71b1aba
Report error if breaker is also timed out.
klauspost Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions circuitbreaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,23 @@ func (cb *Breaker) CallContext(ctx context.Context, circuit func() error, timeou
}
}

if err != nil {
if ctx.Err() != context.Canceled {
if err == nil {
cb.Success()
return nil
}

switch ctx.Err() {
case context.Canceled:
case context.DeadlineExceeded:
// If the breaker timed out as well, report that,
// otherwise consider it "neutral".
if err == ErrBreakerTimeout {
cb.Fail()
}
return err
default:
cb.Fail()
}

cb.Success()
return nil
return err
}

// state returns the state of the TrippableBreaker. The states available are:
Expand Down
3 changes: 2 additions & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ func (c *HTTPClient) Do(req *http.Request) (*http.Response, error) {
var resp *http.Response
var err error
breaker := c.breakerLookup(req.URL.String())
err = breaker.Call(func() error {
ctx := req.Context()
err = breaker.CallContext(ctx, func() error {
resp, err = c.Client.Do(req)
return err
}, c.timeout)
Expand Down