mirror of
https://github.com/christianselig/apollo-backend
synced 2024-11-13 07:27:43 +00:00
fix rate limiting
This commit is contained in:
parent
a1a098b448
commit
7a6955212b
1 changed files with 9 additions and 7 deletions
|
@ -168,7 +168,7 @@ func (rac *AuthenticatedClient) request(r *Request, rh ResponseHandler, empty in
|
|||
bb, remaining, reset, err := rac.doRequest(r)
|
||||
|
||||
if remaining <= RequestRemainingBuffer {
|
||||
rac.markRateLimited(time.Duration(reset) * time.Second)
|
||||
rac.markRateLimited(remaining, time.Duration(reset)*time.Second)
|
||||
}
|
||||
|
||||
if err != nil && r.retry {
|
||||
|
@ -218,22 +218,24 @@ func (rac *AuthenticatedClient) isRateLimited() (bool, error) {
|
|||
}
|
||||
|
||||
key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId)
|
||||
res, err := rac.redis.Exists(context.Background(), key).Result()
|
||||
_, err := rac.redis.Get(context.Background(), key).Result()
|
||||
|
||||
if err != nil {
|
||||
if err == redis.Nil {
|
||||
return false, nil
|
||||
} else if err == nil {
|
||||
return true, nil
|
||||
} else {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return res > 0, nil
|
||||
}
|
||||
|
||||
func (rac *AuthenticatedClient) markRateLimited(duration time.Duration) error {
|
||||
func (rac *AuthenticatedClient) markRateLimited(remaining int, duration time.Duration) error {
|
||||
if rac.redditId == SkipRateLimiting {
|
||||
return ErrRequiresRedditId
|
||||
}
|
||||
|
||||
key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId)
|
||||
_, err := rac.redis.SetEX(context.Background(), key, true, duration).Result()
|
||||
_, err := rac.redis.SetEX(context.Background(), key, remaining, duration).Result()
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue