paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 18:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly calculate expiry of keys we add to Redis

Browse Source 
(imported from commit 42fda34ed1cd1eb9411defa1c0cbf53ef0de7a7b)
This commit is contained in:
Leo Franchi
2013-06-05 16:32:23 -04:00
parent a2a696dacf
commit b815d7ea83
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zephyr/lib/rate_limiter.py
View File

@@ -14,8 +14,6 @@ from itertools import izip
client = redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=0) client = redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=0)
rules = settings.RATE_LIMITING_RULES rules = settings.RATE_LIMITING_RULES
highest_ttl = rules[-1][0]
def _rules_for_user(user): def _rules_for_user(user):
if user.rate_limits != "": if user.rate_limits != "":
return [[int(l) for l in limit.split(':')] for limit in user.rate_limits.split(',')] return [[int(l) for l in limit.split(':')] for limit in user.rate_limits.split(',')]
@@ -35,15 +33,11 @@ def max_api_window(user):
def add_ratelimit_rule(range_seconds, num_requests): def add_ratelimit_rule(range_seconds, num_requests):
"Add a rate-limiting rule to the ratelimiter" "Add a rate-limiting rule to the ratelimiter"
global highest_ttl, rules global rules
rules.append((range_seconds, num_requests)) rules.append((range_seconds, num_requests))
rules.sort(cmp=lambda x, y: x[0] < y[0]) rules.sort(cmp=lambda x, y: x[0] < y[0])
# We can expire a client's list once we have no more rules
# that might need checking
highest_ttl = max(highest_ttl, range_seconds)
def remove_ratelimit_rule(range_seconds, num_requests): def remove_ratelimit_rule(range_seconds, num_requests):
global rules global rules
rules = filter(lambda x: x[0] != range_seconds and x[1] != num_requests, rules) rules = filter(lambda x: x[0] != range_seconds and x[1] != num_requests, rules)
@@ -176,10 +170,6 @@ def incr_ratelimit(user, domain='all'):
# Trim our list to the oldest rule we have # Trim our list to the oldest rule we have
pipe.ltrim(list_key, 0, max_api_calls(user) - 1) pipe.ltrim(list_key, 0, max_api_calls(user) - 1)
# Set the TTL for our keys as well
pipe.expire(list_key, highest_ttl)
pipe.expire(set_key, highest_ttl)
# Add our new value to the sorted set that we keep # Add our new value to the sorted set that we keep
# We need to put the score and val both as timestamp, # We need to put the score and val both as timestamp,
# as we sort by score but remove by value # as we sort by score but remove by value
@@ -189,6 +179,11 @@ def incr_ratelimit(user, domain='all'):
if last_val is not None: if last_val is not None:
pipe.zrem(set_key, last_val) pipe.zrem(set_key, last_val)
# Set the TTL for our keys as well
api_window = max_api_window(user)
pipe.expire(list_key, api_window)
pipe.expire(set_key, api_window)
pipe.execute() pipe.execute()
# If no exception was raised in the execution, there were no transaction conflicts # If no exception was raised in the execution, there were no transaction conflicts