diff --git a/src/bot.py b/src/bot.py index 30b16b1..426eb7b 100644 --- a/src/bot.py +++ b/src/bot.py @@ -256,7 +256,7 @@ async def main_loop(): try: main_tasks = {"message_sender": asyncio.create_task(message_sender()), "database_updates": asyncio.create_task(dbmanager.update_db()), - "fandom_discussions": asyncio.create_task(discussions.tick_discussions())} # "discussion_handler": asyncio.create_task(discussion_handler()), + "fandom_discussions": asyncio.create_task(discussions.tick_discussions(), name="discussions")} # "discussion_handler": asyncio.create_task(discussion_handler()), main_tasks["msg_queue_shield"] = asyncio.shield(main_tasks["message_sender"]) main_tasks["database_updates_shield"] = asyncio.shield(main_tasks["database_updates"]) await asyncio.gather(main_tasks["message_sender"], main_tasks["database_updates"]) diff --git a/src/domain_manager.py b/src/domain_manager.py index 6ca1a39..018b76a 100644 --- a/src/domain_manager.py +++ b/src/domain_manager.py @@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Callable from urllib.parse import urlparse, urlunparse import logging import asyncpg - +import asyncio from src.exceptions import NoDomain from src.config import settings from src.domain import Domain @@ -46,8 +46,11 @@ class DomainManager: elif split_payload[0] == "DEBUG": logger.info(self.domains) for name, domain in self.domains.items(): - logger.info("{name} - Status: {status}, exception: {exception}".format(name=name, status=domain.task.done(), - exception=domain.task.print_stack())) + logger.info("{name} - Status: {status}, exception: {exception}, irc: {irc}".format(name=name, status=domain.task.done(), + exception=domain.task.print_stack(), irc=str(domain.irc))) + for item in asyncio.all_tasks(): # Get discussions task + if item.get_name() == "discussions": + logger.info(item) if self.check_for_domain(self.get_domain(split_payload[1])): logger.info(str(self.return_domain(self.get_domain(split_payload[1])).get_wiki(split_payload[1]))) else: diff --git a/src/irc_feed.py b/src/irc_feed.py index 579873c..be11ae3 100644 --- a/src/irc_feed.py +++ b/src/irc_feed.py @@ -32,6 +32,12 @@ class AioIRCCat(irc.client_aio.AioSimpleIRCClient): self.connection.buffer_class.errors = "replace" # Ignore encoding errors self.connection_details = None + def __str__(self): + return self.__repr__() + + def __repr__(self): + return f"" + def on_welcome(self, connection, event): # Join IRC channels logger.debug("Logged into IRC for {domain_name}".format(domain_name=self.domain.name)) for channel in self.targets.values():