updated readme and resetted pollmaster files

pm/cogs/poll_controls.py

@@ -50,9 +50,7 @@ class PollControls(commands.Cog):
         while True:
             try:
                 if not hasattr(self.bot, 'db'):
-                    """await asyncio.sleep(30)"""
-                    logger.info("DB not available yet")
-                    time.sleep(30)
+                    await asyncio.sleep(30)
                     continue
 
                 query = self.bot.db.polls.find({'active': False, 'activation': {"$not": re.compile("0")}})

pm/pollmaster.py

@@ -13,8 +13,6 @@ from motor.motor_asyncio import AsyncIOMotorClient
 from essentials.multi_server import get_pre
 from essentials.settings import SETTINGS
 
-from pprint import pprint
-
 bot_config = {
     'command_prefix': get_pre,
     'pm_help': False,
@@ -45,9 +43,17 @@ ch.setFormatter(formatter)
 logger.addHandler(fh)
 logger.addHandler(ch)
 
+extensions = ['cogs.config', 'cogs.poll_controls', 'cogs.help', 'cogs.db_api', 'cogs.admin']
+for ext in extensions:
+    bot.load_extension(ext)
+
+
 @bot.event
 async def on_ready():
     bot.owner = await bot.fetch_user(SETTINGS.owner_id)
+
+    mongo = AsyncIOMotorClient(SETTINGS.mongo_db)
+    bot.db = mongo.pollmaster
     bot.session = aiohttp.ClientSession()
     print(bot.db)
 
@@ -65,7 +71,6 @@ async def on_ready():
 
     except:
         print("Problem verifying servers.")
-        logger.error("Problem verifying servers.")
 
     # cache prefixes
     bot.pre = {entry['_id']: entry['prefix'] async for entry in bot.db.config.find({}, {'_id', 'prefix'})}
@@ -77,7 +82,6 @@ async def on_ready():
     await bot.change_presence(status=discord.Status.online, activity=game)
 
     print("Servers verified. Bot running.")
-    logger.info("Servers verified. Bot running.")
 
 @bot.event
 async def on_command_error(ctx, e):
@@ -132,19 +136,4 @@ async def on_guild_join(server):
         )
         bot.pre[str(server.id)] = 'pm!'
 
-logger.info("Connecting to Mongo DB: " + SETTINGS.mongo_db)
-mongo = AsyncIOMotorClient(SETTINGS.mongo_db)
-
-pprint(mongo)
-
-bot.db = mongo.pollmaster
-print(bot.db)
-pprint(bot.db)
-
-extensions = ['cogs.config', 'cogs.poll_controls', 'cogs.help', 'cogs.db_api', 'cogs.admin']
-for ext in extensions:
-    logger.info("Loading extension " + ext)
-    bot.load_extension(ext)
-
-pprint(SETTINGS.bot_token)
-bot.run(SETTINGS.bot_token)
+bot.run(SETTINGS.bot_token)