From 9cae625cc23f45316a332645aa6c3441d27ddc2b Mon Sep 17 00:00:00 2001 From: phixxy Date: Fri, 2 Feb 2024 22:11:52 -0800 Subject: [PATCH] sparky logger should be working properly now --- extensions/inky_phat.py | 9 ++++++--- sparkytron3000.py | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/extensions/inky_phat.py b/extensions/inky_phat.py index 688dbe1..5d96b25 100644 --- a/extensions/inky_phat.py +++ b/extensions/inky_phat.py @@ -17,9 +17,12 @@ class InkyScreen(commands.Cog): self.admin_ids = [242018983241318410] def setup(self): - display = inky.auto() - display.set_border(inky.BLACK) - return display + if self.enabled: + display = inky.auto() + display.set_border(inky.BLACK) + return display + else: + return None def write_to_display(self, text: list): if text is not self.old_message: diff --git a/sparkytron3000.py b/sparkytron3000.py index eaf4c48..11d339f 100644 --- a/sparkytron3000.py +++ b/sparkytron3000.py @@ -10,21 +10,20 @@ import src.logger as logger load_dotenv() discord_token = os.getenv('discord_token') -logger = logger.logging.getLogger("bot") - intents = discord.Intents.all() intents.message_content = True bot = commands.Bot(command_prefix='!', intents=intents) + + async def folder_setup(): try: - folder_names = ["tmp", "extensions", "data"] + folder_names = ["tmp", "extensions", "data", "logs"] for folder_name in folder_names: if not os.path.exists(folder_name): os.mkdir(folder_name) - return folder_names except Exception as e: - logger.error(f"Error setting up folders: {e}") + logger.exception(f"Error setting up folders: {e}") async def delete_all_files(path): try: @@ -34,7 +33,7 @@ async def delete_all_files(path): elif os.path.isfile(path+filename): os.remove(path+filename) except Exception as e: - logger.error(f"Error deleting files: {e}") + logger.exception(f"Error deleting files: {e}") @tasks.loop(seconds=1) # Run the task every second async def task_loop(): @@ -45,7 +44,7 @@ async def task_loop(): await delete_all_files("tmp/") logger.info("Deleted tmp/ files.") except Exception as e: - logger.error(f"Error in task loop: {e}") + logger.exception(f"Error in task loop: {e}") async def create_session(): return aiohttp.ClientSession() @@ -64,11 +63,20 @@ async def on_resumed(): @bot.event async def on_disconnect(): await close_session(bot.http_session) + +def logger_setup(): + if not os.path.isdir("logs"): + os.mkdir("logs") + with open("logs/info.log", "a") as f: + pass + logger = logger.logging.getLogger("bot") + bot.logger = logger + @bot.event async def on_ready(): try: - bot.logger = logger + await folder_setup() await delete_all_files("tmp/") # Import plugins from extensions folder for plugin_file in os.listdir('extensions/'): @@ -77,7 +85,7 @@ async def on_ready(): logger.info('We have logged in as {0.user}'.format(bot)) task_loop.start() except Exception as e: - logger.error(f"Error in on_ready: {e}") + logger.warning(f"Error in on_ready: {e}") raise @bot.event @@ -87,9 +95,10 @@ async def on_message(ctx): except commands.CommandNotFound: pass except Exception as e: - logger.error(f"Error processing commands: {e}") + logger.warning(f"Error processing commands: {e}") try: + logger_setup() bot.run(discord_token, root_logger=True) except Exception as e: logger.critical(f"Fatal error running bot: {e}")