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

rate_limiter: Upgrade api_calls_left to generic API.

This commit is contained in:
Umair Khan 2017-07-31 10:55:09 +05:00 committed by Greg Price
parent 81e2128774
commit ef1b880082
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/decorator.py
View File

@ -664,7 +664,7 @@ def rate_limit_user(request, user, domain):
raise RateLimited()
incr_ratelimit(entity)
calls_remaining, time_reset = api_calls_left(user, domain)
calls_remaining, time_reset = api_calls_left(entity)
request._ratelimit_remaining = calls_remaining
request._ratelimit_secs_to_freedom = time_reset

12
zerver/lib/rate_limiter.py
View File

@ -108,9 +108,8 @@ def clear_history(entity):
for key in entity.get_keys():
client.delete(key)
def _get_api_calls_left(user, domain, range_seconds, max_calls):
# type: (UserProfile, Text, int, int) -> Tuple[int, float]
entity = RateLimitedUser(user, domain=domain)
def _get_api_calls_left(entity, range_seconds, max_calls):
# type: (RateLimitedObject, int, int) -> Tuple[int, float]
list_key, set_key, _ = entity.get_keys()
# Count the number of values in our sorted set
# that are between now and the cutoff
@ -137,14 +136,13 @@ def _get_api_calls_left(user, domain, range_seconds, max_calls):
return calls_left, time_reset
def api_calls_left(user, domain='all'):
# type: (UserProfile, Text) -> Tuple[int, float]
def api_calls_left(entity):
# type: (RateLimitedObject) -> Tuple[int, float]
"""Returns how many API calls in this range this client has, as well as when
the rate-limit will be reset to 0"""
entity = RateLimitedUser(user, domain=domain)
max_window = max_api_window(entity)
max_calls = max_api_calls(entity)
return _get_api_calls_left(user, domain, max_window, max_calls)
return _get_api_calls_left(entity, max_window, max_calls)
def is_ratelimited(entity):
# type: (RateLimitedObject) -> Tuple[bool, float]