refactor: http retry for retryable errors (#20)

This commit is contained in:
l3uddz
2021-02-21 14:01:21 +00:00
committed by GitHub
parent a2848439b9
commit db9fdc97a2
21 changed files with 150 additions and 115 deletions

View File

@@ -28,13 +28,8 @@ func (c *Client) GetItem(imdbId string) (*Item, error) {
return nil, fmt.Errorf("generate lookup request url: %w", err)
}
c.log.Trace().
Str("url", reqUrl).
Msg("Searching omdb")
// send request
c.rl.Take()
resp, err := rek.Get(reqUrl, rek.Timeout(c.apiTimeout))
resp, err := rek.Get(reqUrl, rek.Client(c.http))
if err != nil {
return nil, fmt.Errorf("request lookup: %w", err)
}

View File

@@ -2,27 +2,31 @@ package omdb
import (
"github.com/l3uddz/nabarr/logger"
"github.com/l3uddz/nabarr/util"
"github.com/rs/zerolog"
"go.uber.org/ratelimit"
"net/http"
"time"
)
type Client struct {
apiKey string
log zerolog.Logger
rl ratelimit.Limiter
log zerolog.Logger
http *http.Client
apiURL string
apiTimeout time.Duration
apiKey string
apiURL string
}
func New(cfg *Config) *Client {
return &Client{
apiKey: cfg.ApiKey,
log: logger.New(cfg.Verbosity).With().Logger(),
rl: ratelimit.New(1, ratelimit.WithoutSlack),
l := logger.New(cfg.Verbosity).With().
Str("media", "omdb").
Logger()
apiURL: "https://www.omdbapi.com",
apiTimeout: 30 * time.Second,
return &Client{
log: l,
http: util.NewRetryableHttpClient(30*time.Second, ratelimit.New(1, ratelimit.WithoutSlack), &l),
apiKey: cfg.ApiKey,
apiURL: "https://www.omdbapi.com",
}
}