Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rate_limiter: Fix secs_to_freedom being set to a timestamp. 

time_reset returned from api_calls_left() was a timestamp, but
mistakenly treated as delta seconds. We change the return value of
api_calls_left() to be delta seconds, to be consistent with the return
value of rate_limit().
This commit is contained in:
Mateusz Mandera 2020-04-01 18:44:19 +02:00 committed by Tim Abbott
parent fc2b6c9c06
commit 4b567d8edd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/rate_limiter.py
View File

@ -54,10 +54,10 @@ class RateLimitedObject(ABC):
# Pass information about what kind of entity got limited in the exception:
raise RateLimited(str(time))
calls_remaining, time_reset = self.api_calls_left()
calls_remaining, seconds_until_reset = self.api_calls_left()
request._ratelimits_applied[-1].remaining = calls_remaining
request._ratelimits_applied[-1].secs_to_freedom = time_reset
request._ratelimits_applied[-1].secs_to_freedom = seconds_until_reset
def block_access(self, seconds: int) -> None:
"Manually blocks an entity for the desired number of seconds"
@ -212,7 +212,7 @@ class RedisRateLimiterBackend(RateLimiterBackend):
else:
time_reset = now
return calls_left, time_reset
return calls_left, time_reset - now
@classmethod
def is_ratelimited(cls, entity_key: str, rules: List[Tuple[int, int]]) -> Tuple[bool, float]: