From 7d1cb08c6d7be49826ba0837599af5c1e171a792 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Tue, 30 Aug 2022 00:48:27 -0400 Subject: [PATCH] Remove buckets from webhook ratelimit warnings --- discord/webhook/async_.py | 7 +++---- discord/webhook/sync.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/discord/webhook/async_.py b/discord/webhook/async_.py index 7e4286e89..dd6d23378 100644 --- a/discord/webhook/async_.py +++ b/discord/webhook/async_.py @@ -189,9 +189,8 @@ class AsyncWebhookAdapter: if remaining == '0' and response.status != 429: delta = utils._parse_ratelimit_header(response) _log.debug( - 'Webhook ID %s has exhausted its rate limit bucket (bucket: %s, retry: %s).', + 'Webhook ID %s has exhausted its rate limit bucket (retry: %s).', webhook_id, - bucket, delta, ) lock.delay_by(delta) @@ -202,10 +201,10 @@ class AsyncWebhookAdapter: if response.status == 429: if not response.headers.get('Via'): raise HTTPException(response, data) - fmt = 'Webhook ID %s is rate limited. Retrying in %.2f seconds. Handled under the bucket %s' + fmt = 'Webhook ID %s is rate limited. Retrying in %.2f seconds.' retry_after: float = data['retry_after'] # type: ignore - _log.warning(fmt, webhook_id, retry_after, bucket, stack_info=True) + _log.warning(fmt, webhook_id, retry_after) await asyncio.sleep(retry_after) continue diff --git a/discord/webhook/sync.py b/discord/webhook/sync.py index 8cb5eb20e..0cfaf7715 100644 --- a/discord/webhook/sync.py +++ b/discord/webhook/sync.py @@ -188,9 +188,8 @@ class WebhookAdapter: if remaining == '0' and response.status_code != 429: delta = utils._parse_ratelimit_header(response) _log.debug( - 'Webhook ID %s has exhausted its rate limit bucket (bucket: %s, retry: %s).', + 'Webhook ID %s has exhausted its rate limit bucket (retry: %s).', webhook_id, - bucket, delta, ) lock.delay_by(delta) @@ -201,10 +200,10 @@ class WebhookAdapter: if response.status_code == 429: if not response.headers.get('Via'): raise HTTPException(response, data) - fmt = 'Webhook ID %s is rate limited. Retrying in %.2f seconds. Handled under the bucket %s' + fmt = 'Webhook ID %s is rate limited. Retrying in %.2f seconds.' retry_after: float = data['retry_after'] # type: ignore - _log.warning(fmt, webhook_id, retry_after, stack_info=True) + _log.warning(fmt, webhook_id, retry_after) time.sleep(retry_after) continue