Shutdown handlers

Author: gccody

Diff for: launcher.py

@@ -31,12 +31,6 @@ async def start():
         await bot.load_extension(f"lib.cogs.{cog}")
         progress.next()
 
-        # @bot.event
-        # async def on_interaction(ctx: Interaction):
-        #     if isinstance(ctx.command, Command):
-        #         print('is Command')
-        #         raise BotNotReady()
-
         @bot.tree.error
         async def on_command_error(ctx: Interaction, exc) -> None:
             if any([isinstance(exc, error) for error in IGNORE_EXCEPTIONS]):
@@ -57,8 +51,8 @@ async def on_command_error(ctx: Interaction, exc) -> None:
                 await bot.send(ctx, embed=embed)
             elif isinstance(exc, NotFound):
                 await bot.send(ctx,
-                    embed=Embed(title='Not Found Error', description='One or more items could not be found.',
-                                colour=0xff0000))
+                               embed=Embed(title='Not Found Error', description='One or more items could not be found.',
+                                           colour=0xff0000))
             elif hasattr(exc, "original"):
                 if isinstance(exc.original, HTTPException):
                     embed: Embed = Embed(title="Http Error", description='Message failed to send', colour=0xff0000)
@@ -75,12 +69,6 @@ async def on_command_error(ctx: Interaction, exc) -> None:
 
     def exit_handler():
         bot.db.commit()
-        # try:
-        #     loop = asyncio.get_running_loop()
-        # except RuntimeError:
-        #     loop = asyncio.new_event_loop()
-        # loop.run_until_complete(bot.close())
-        # asyncio.run(bot.close())
 
     atexit.register(exit_handler)
     await bot.start(bot.config.token)

Diff for: lib/bot/__init__.py

@@ -54,6 +54,7 @@ async def on_connect(self):
             print('Shards Not Ready')
             await asyncio.sleep(.5)
         self.register_guilds()
+        asyncio.ensure_future(self.monitor_shutdown())
         print(f"Signed into {self.user.display_name}#{self.user.discriminator}")
         # asyncio.ensure_future(self.timer.start())
 
@@ -94,6 +95,20 @@ async def send(ctx: Interaction, *args, **kwargs):
         except NotFound:
             return await ctx.response.send_message(*args, **kwargs)
 
+    async def monitor_shutdown(self):
+        while True:
+            if psutil.Process().status() == psutil.STATUS_ZOMBIE:
+                # Perform cleanup actions, such as committing the database
+                self.db.commit()
+                break
+            if psutil.process_iter(['pid', 'name']):
+                for process in psutil.process_iter():
+                    if process.name() == 'shutdown.exe':
+                        self.db.commit()
+                        await self.close()
+                        exit()
+            await asyncio.sleep(1)
+
     def register_guilds(self):
         progress = Progress('Registering guilds', len(self.guilds))
         for guild in self.guilds: