Skip to content

Send webhooks in a new thread. #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Send webhooks in a new thread. #1

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
26 changes: 19 additions & 7 deletions discord_logging/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Python logging support for Discord."""
import logging
import sys
import threading
from typing import Optional, List

from discord_webhook import DiscordEmbed, DiscordWebhook
Expand Down Expand Up @@ -45,7 +46,7 @@ def __init__(self,
rate_limit_retry: bool=True,
embed_line_wrap_threshold: int=60,
message_break_char: Optional[str]=None,
discord_timeout: float=5.0):
discord_timeout: float=10.0):
"""

:param service_name: Shows at the bot username in Discord.
Expand Down Expand Up @@ -138,6 +139,21 @@ def attempt_to_report_failure(self, resp: Response, orignal: DiscordWebhook):
discord.content = f"Failed to deliver log message: {resp.status_code}: {resp.content}"
discord.execute()

def send_webhook_async(self, discord, record):
try:
thread_id = getattr(record, 'thread_id', None)
thread_name = getattr(record, 'thread_name', None)
discord.thread_id = thread_id
discord.thread_name = thread_name

resp = discord.execute()
assert isinstance(resp, Response), f"Discord webhook replies: {resp}"
if resp.status_code != 200:
self.attempt_to_report_failure(resp, discord)
except Exception as e:
print(f"Error from Discord logger {e}", file=sys.stderr)
self.handleError(record)

def emit(self, record: logging.LogRecord):
"""Send a log entry to Discord."""

Expand Down Expand Up @@ -215,12 +231,8 @@ def emit(self, record: logging.LogRecord):
embed = DiscordEmbed(title=title, color=colour)
discord.add_embed(embed)

# Can be one or list of responses,
# bad API design
resp = discord.execute()
assert isinstance(resp, Response), f"Discord webhook replies: {resp}"
if resp.status_code != 200:
self.attempt_to_report_failure(resp, discord)
webhook_thread = threading.Thread(target=self.send_webhook_async, args=(discord, record))
webhook_thread.start()

except Exception as e:
# We cannot use handleError here, because Discord request may cause
Expand Down