Migrate events.py to logging

This commit is contained in:
Nexus 2023-12-05 17:26:09 +00:00
parent b38ae29125
commit 6fbcf85da8
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 15 additions and 12 deletions

View file

@ -90,6 +90,7 @@ class Events(commands.Cog):
self.bot.bridge_queue = asyncio.Queue()
self.fetch_discord_atom_feed.start()
self.bridge_health = False
self.log = logging.getLogger("jimmy.cogs.events")
def cog_unload(self):
self.fetch_discord_atom_feed.cancel()
@ -111,16 +112,17 @@ class Events(commands.Cog):
if member.guild is None or member.guild.id not in guilds:
return
student: Optional[Student] = await get_or_none(Student, user_id=member.id)
if student and student.id:
role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles)
if role and role < member.guild.me.top_role:
await member.add_roles(role, reason="Verified")
# student: Optional[Student] = await get_or_none(Student, user_id=member.id)
# if student and student.id:
# role = discord.utils.find(lambda r: r.name.lower() == "verified", member.guild.roles)
# if role and role < member.guild.me.top_role:
# await member.add_roles(role, reason="Verified")
channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
if channel and channel.can_send():
await channel.send(
f"{LTR} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
# f"{LTR} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
f"{LTR} {member.mention}"
)
@commands.Cog.listener()
@ -128,11 +130,12 @@ class Events(commands.Cog):
if member.guild is None or member.guild.id not in guilds:
return
student: Optional[Student] = await get_or_none(Student, user_id=member.id)
# student: Optional[Student] = await get_or_none(Student, user_id=member.id)
channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general")
if channel and channel.can_send():
await channel.send(
f"{RTL} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
# f"{RTL} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})"
f"{RTL} {member.mention}"
)
async def process_message_for_github_links(self, message: discord.Message):
@ -233,7 +236,7 @@ class Events(commands.Cog):
)
region = message.author.voice.channel.rtc_region
# noinspection PyUnresolvedReferences
console.log(
self.log.warning(
"Timed out connecting to voice channel: {0.name} in {0.guild.name} "
"(region {1})".format(
message.author.voice.channel, region.name if region else "auto (unknown)"
@ -254,7 +257,7 @@ class Events(commands.Cog):
_dc(voice),
)
if err is not None:
console.log(f"Error playing audio: {err}")
self.log.error(f"Error playing audio: {err}", exc_info=err)
self.bot.loop.create_task(message.add_reaction("\N{speaker with cancellation stroke}"))
else:
self.bot.loop.create_task(
@ -575,14 +578,14 @@ class Events(commands.Cog):
try:
response = await self.http.get("https://discordstatus.com/history.atom", headers=headers)
except httpx.HTTPError as e:
console.log("Failed to fetch discord atom feed:", e)
self.log.error("Failed to fetch discord atom feed: %r", e, exc_info=e)
return
if response.status_code == 304:
return
if response.status_code != 200:
console.log("Failed to fetch discord atom feed:", response.status_code)
self.log.error("Failed to fetch discord atom feed: HTTP/%s", response.status_code)
return
with file.open("wb") as f: