Handle asyncio events within config class

Author: kyb3r

bot.py

@@ -61,7 +61,6 @@ def __init__(self):
         self.threads = ThreadManager(self)
         self.session = aiohttp.ClientSession(loop=self.loop)
         self.config = ConfigManager(self)
-        self.config_ready = asyncio.Event()
         self.selfhosted = bool(self.config.get('mongo_uri'))
         if self.selfhosted:
             self.db = AsyncIOMotorClient(self.config.mongo_uri).modmail_bot
@@ -178,7 +177,6 @@ async def on_connect(self):
         print(Fore.CYAN + 'Connected to gateway.')
 
         await self.config.refresh()
-        self.config_ready.set()
 
         activity_type = self.config.get('activity_type')
         message = self.config.get('activity_message')
@@ -206,7 +204,7 @@ async def on_ready(self):
         else:
             await self.threads.populate_cache()
 
-        await self.config_ready.wait() # Wait until config cache is popluated with stuff from db
+        await self.config.wait_until_ready() # Wait until config cache is popluated with stuff from db
 
         closures = self.config.closures.copy()
 

core/config.py

@@ -1,8 +1,8 @@
+import asyncio
 import os
 import json
 import box
 
-
 class ConfigManager:
     """Class that manages a cached configuration"""
 
@@ -29,8 +29,11 @@ class ConfigManager:
     def __init__(self, bot):
         self.bot = bot
         self.cache = box.Box()
-        self._modified = True
+        self.ready_event = asyncio.Event()
         self.populate_cache()
+    
+    def __repr__(self):
+        return repr(self.cache)
 
     @property
     def api(self):
@@ -58,7 +61,6 @@ def populate_cache(self):
 
     async def update(self, data=None):
         """Updates the config with data from the cache"""
-        self._modified = False
         if data is not None:
             self.cache.update(data)
         await self.api.update_config(self.cache)
@@ -67,6 +69,10 @@ async def refresh(self):
         """Refreshes internal cache with data from database"""
         data = await self.api.get_config()
         self.cache.update(data)
+        self.ready_event.set()
+    
+    async def wait_until_ready(self):
+        await self.ready_event.wait()
 
     def __getattr__(self, value):
         return self.cache[value]