Skip to content

Commit 5b8a993

Browse files
committed
Updated logging supression for deps, add test pypi to index
1 parent 80f364d commit 5b8a993

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

modmail/core/internals/staff_guild.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ async def _format_log_channel_message_embed(
488488
embed.timestamp = ticket.created_at
489489
else:
490490
embed.colour = discord.Colour.red()
491-
if not ticket.closed_by or ticket.closed_by.user_id == self.bot.user.id:
491+
if not ticket.closed_by or ticket.closed_by.user_id == self.guild.me.id:
492492
embed.set_footer(text=_("ftl-msg-log-embed-closed-footer-unknown-closer"))
493493
else:
494494
embed.set_footer(text=_("ftl-msg-log-embed-closed-footer", user=ticket.closed_by.user_name))

modmail/logging.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99

1010
import logging
1111
from logging.handlers import RotatingFileHandler
12+
from types import ModuleType
1213

13-
import discord
14-
import sqlalchemy
1514
from rich.logging import RichHandler
1615
from rich.text import Text
1716

@@ -67,12 +66,32 @@ def setup_logging() -> None:
6766

6867
# Configure RichHandler for console logging with rich formatting.
6968
formatter = logging.Formatter(CONFIG.logging.stdout_format)
69+
70+
# Suppress tracebacks from certain modules for cleaner output.
71+
import discord
72+
73+
tracebacks_suppress: list[ModuleType] = [discord]
74+
75+
try:
76+
import sqlalchemy
77+
78+
tracebacks_suppress.append(sqlalchemy)
79+
except ImportError:
80+
pass
81+
82+
try:
83+
import pymongo
84+
85+
tracebacks_suppress.append(pymongo)
86+
except ImportError:
87+
pass
88+
7089
handler = RichHandler(
7190
show_level=True,
7291
rich_tracebacks=True,
7392
tracebacks_show_locals=True,
7493
log_time_format=lambda dt: Text(dt.strftime("%X,%f")[:-3]),
75-
tracebacks_suppress=[discord, sqlalchemy],
94+
tracebacks_suppress=tracebacks_suppress,
7695
)
7796
handler.setFormatter(formatter)
7897
handler.setLevel(CONFIG.logging.console_level)

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ Funding = "https://buymeacoffee.com/modmaildev"
8787
[tool.uv]
8888
default-groups = "all"
8989

90+
[[tool.uv.index]]
91+
name = "testpypi"
92+
url = "https://test.pypi.org/simple/"
93+
publish-url = "https://test.pypi.org/legacy/"
94+
explicit = true
95+
9096
[tool.uv.build-backend]
9197
module-name = "modmail"
9298
module-root = "" # default expects src/, we have everything in the root

0 commit comments

Comments
 (0)