Skip to content

Commit

Permalink
PA-26431 Fix Insrequester Timeout Data Type (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
rafet authored Apr 26, 2024
1 parent 6c5fad5 commit 2fc6ed5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions insrequester/README.md
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
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

0 comments on commit 2fc6ed5

Please sign in to comment.