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

check_redis: Fix for key format change and Python 3. 

Commit 81d7dd1fda broke this nearly
eight years ago, so probably nobody cares except the ever-watchful eye
of mypy.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-07-02 21:44:37 -07:00 committed by Tim Abbott
parent 684dad8145
commit 325cb89cbf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/management/commands/check_redis.py
View File

@ -20,11 +20,11 @@ class Command(BaseCommand):
def _check_within_range(
self,
key: str,
key: bytes,
count_func: Callable[[], int],
trim_func: Optional[Callable[[str, int], object]] = None,
trim_func: Optional[Callable[[bytes, int], object]] = None,
) -> None:
user_id = int(key.split(":")[1])
user_id = int(key.split(b":")[2])
user = get_user_profile_by_id(user_id)
entity = RateLimitedUser(user)
max_calls = entity.max_api_calls()
@ -50,10 +50,10 @@ than max_api_calls! (trying to trim) %s %s",
raise CommandError("This machine is not using Redis or rate limiting, aborting")
# Find all keys, and make sure they're all within size constraints
wildcard_list = "ratelimit:*:*:list"
wildcard_zset = "ratelimit:*:*:zset"
wildcard_list = "ratelimit:*:*:*:list"
wildcard_zset = "ratelimit:*:*:*:zset"
trim_func: Optional[Callable[[str, int], object]] = lambda key, max_calls: client.ltrim(
trim_func: Optional[Callable[[bytes, int], object]] = lambda key, max_calls: client.ltrim(
key, 0, max_calls - 1
)
if not options["trim"]: