Skip to content
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

Jump to bottom

Release v0.10.0 #31

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Release v0.10.0 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions insrequester/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ requester.WithCircuitbreaker(circuitBreakerConfig)
For setting a timeout on requests, you can utilize the WithTimeout method:

```go
timeoutSeconds := 30
requester.WithTimeout(timeoutSeconds) // this timeout overrides the default timeout
timeout := 30 * time.Duration
requester.WithTimeout(timeout) // this timeout overrides the default timeout
```

#### Default Headers
Expand Down
18 changes: 9 additions & 9 deletions insrequester/requester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/slok/goresilience/circuitbreaker"
goresilienceErrors "github.com/slok/goresilience/errors"
"github.com/slok/goresilience/retry"
"github.com/slok/goresilience/timeout"
resilienceTimeout "github.com/slok/goresilience/timeout"
"net/http"
"time"
)
Expand Down Expand Up @@ -38,7 +38,7 @@ type Requester interface {
Delete(re RequestEntity) (*http.Response, error)
WithRetry(config RetryConfig) *Request
WithCircuitbreaker(config CircuitBreakerConfig) *Request
WithTimeout(timeoutSeconds int) *Request
WithTimeout(timeout time.Duration) *Request
WithHeaders(headers Headers) *Request
Load() *Request
}
Expand All @@ -53,7 +53,7 @@ type RequestEntity struct {
}

type Request struct {
timeout int
timeout time.Duration
runner goresilience.Runner
middlewares []goresilience.Middleware
headers Headers
Expand Down Expand Up @@ -187,15 +187,15 @@ func (r *Request) WithCircuitbreaker(config CircuitBreakerConfig) *Request {
return r
}

func (r *Request) WithTimeout(timeoutSeconds int) *Request {
if timeoutSeconds == 0 {
r.timeout = 30
func (r *Request) WithTimeout(timeout time.Duration) *Request {
if timeout == 0 {
r.timeout = 30 * time.Second
} else {
r.timeout = timeoutSeconds
r.timeout = timeout
}

mw := timeout.NewMiddleware(timeout.Config{
Timeout: time.Duration(r.timeout) * time.Second,
mw := resilienceTimeout.NewMiddleware(resilienceTimeout.Config{
Timeout: r.timeout,
})
r.middlewares = append(r.middlewares, mw)

Expand Down
Loading