paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rate_limiter: Add types on Redis-fetched data.

Browse Source 
This gives us type-checking, to help prevent bugs like the
last couple of commits fixed in our Tornado code and our
missed-message email handling.  Fortunately no behavior
changes are needed here.
This commit is contained in:
Greg Price
2017-08-25 15:52:43 -07:00
committed by Tim Abbott
parent b63e995e82
commit 5ba4b1bd4f
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/lib/rate_limiter.py
View File

@@ -2,7 +2,7 @@ from __future__ import absolute_import
import os import os
from typing import Any, Iterator, List, Tuple, Text from typing import Any, Iterator, List, Optional, Tuple, Text
from django.conf import settings from django.conf import settings
from zerver.lib.redis_utils import get_redis_client from zerver.lib.redis_utils import get_redis_client
@@ -125,8 +125,8 @@ def _get_api_calls_left(entity, range_seconds, max_calls):
results = pipe.execute() results = pipe.execute()
count = results[0] count = results[0] # type: int
newest_call = results[1] newest_call = results[1] # type: Optional[bytes]
calls_left = max_calls - count calls_left = max_calls - count
if newest_call is not None: if newest_call is not None:
@@ -165,18 +165,18 @@ def is_ratelimited(entity):
pipe.get(blocking_key) pipe.get(blocking_key)
pipe.ttl(blocking_key) pipe.ttl(blocking_key)
rule_timestamps = pipe.execute() rule_timestamps = pipe.execute() # type: List[Optional[bytes]]
# Check if there is a manual block on this API key # Check if there is a manual block on this API key
blocking_ttl = rule_timestamps.pop() blocking_ttl_b = rule_timestamps.pop()
key_blocked = rule_timestamps.pop() key_blocked = rule_timestamps.pop()
if key_blocked is not None: if key_blocked is not None:
# We are manually blocked. Report for how much longer we will be # We are manually blocked. Report for how much longer we will be
if blocking_ttl is None: if blocking_ttl_b is None:
blocking_ttl = 0.5 blocking_ttl = 0.5
else: else:
blocking_ttl = int(blocking_ttl) blocking_ttl = int(blocking_ttl_b)
return True, blocking_ttl return True, blocking_ttl
now = time.time() now = time.time()
@@ -186,8 +186,7 @@ def is_ratelimited(entity):
if timestamp is None: if timestamp is None:
continue continue
timestamp = float(timestamp) boundary = float(timestamp) + range_seconds
boundary = timestamp + range_seconds
if boundary > now: if boundary > now:
free = boundary - now free = boundary - now
return True, free return True, free