Skip to content

Fix infinite rate limit #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miohtama merged 1 commit into from
Dec 24, 2024
Merged

Fix infinite rate limit #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions discord_logging/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def split_by_break_character(self, content: str) -> List[str]:
else:
return [content]

def attempt_to_report_failure(self, resp: Response, orignal: DiscordWebhook):
def attempt_to_report_failure(self, resp: Response, original: DiscordWebhook):
"""Attempt to report a failure to deliver a log message.

Usually this happens if we pass content to Discord the server does not like.
Expand All @@ -126,7 +126,7 @@ def attempt_to_report_failure(self, resp: Response, orignal: DiscordWebhook):
"""
# Output to the stderr, as it is not safe to use logging here
#
print(f"Discord webhook request failed: {resp.status_code}: {resp.content}. Payload content was: {orignal.content}, embeds: {orignal.embeds}", file=sys.stderr)
print(f"Discord webhook request failed: {resp.status_code}: {resp.content}. Payload content was: {original.content}, embeds: {original.embeds}", file=sys.stderr)
# Attempt to warn user about log failure
discord = DiscordWebhook(
url=self.webhook_url,
Expand Down Expand Up @@ -219,7 +219,12 @@ def emit(self, record: logging.LogRecord):
# bad API design
resp = discord.execute()
assert isinstance(resp, Response), f"Discord webhook replies: {resp}"
if resp.status_code != 200:

# 429 is rate limit status code
# if the request is retried, it would also log another error, which creates
# infinite loop of rate limit
# https://github.com/lovvskillz/python-discord-webhook/blob/64e5fd52c8d171442762a793c224d983a4202251/discord_webhook/webhook.py#L417-L419
if resp.status_code not in [200, 204, 429]:
self.attempt_to_report_failure(resp, discord)

except Exception as e:
Expand Down