Merge pull request #1 from discord-python/master

Merge

1 files changed, 12 insertions, 12 deletions

diff --git a/bot/bot.py b/bot/__main__.py
index a40ed0d4..ccd69b0b 100644
--- a/bot/bot.py
+++ b/bot/__main__.py
@@ -1,39 +1,39 @@
+import logging
 from os import environ
 from pathlib import Path
-from sys import stderr
-from traceback import print_exc, format_exc
+from traceback import format_exc
 
 from discord.ext import commands
-import logging
 
 HACKTOBERBOT_TOKEN = environ.get('HACKTOBERBOT_TOKEN')
+log = logging.getLogger()
 
 if HACKTOBERBOT_TOKEN:
     token_dl = len(HACKTOBERBOT_TOKEN) // 8
-    logging.info(f'Bot token loaded: {HACKTOBERBOT_TOKEN[:token_dl]}...{HACKTOBERBOT_TOKEN[-token_dl:]}')
+    log.info(f'Bot token loaded: {HACKTOBERBOT_TOKEN[:token_dl]}...{HACKTOBERBOT_TOKEN[-token_dl:]}')
 else:
-    logging.error(f'Bot token not found: {HACKTOBERBOT_TOKEN}')
+    log.error(f'Bot token not found: {HACKTOBERBOT_TOKEN}')
 
 ghost_unicode = "\N{GHOST}"
 bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unicode} ", ghost_unicode))
 
-logging.info('Start loading extensions from ./cogs/')
+log.info('Start loading extensions from ./bot/cogs/')
 
 
 if __name__ == '__main__':
     # Scan for files in the /cogs/ directory and make a list of the file names.
-    cogs = [file.stem for file in Path('cogs').glob('*.py')]
+    cogs = [file.stem for file in Path('bot', 'cogs').glob('*.py')]
     for extension in cogs:
         try:
-            bot.load_extension(f'cogs.{extension}')
-            logging.info(f'Successfully loaded extension: {extension}')
+            bot.load_extension(f'bot.cogs.{extension}')
+            log.info(f'Successfully loaded extension: {extension}')
         except Exception as e:
-            logging.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}')
+            log.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}')
             # print(f'Failed to load extension {extension}.', file=stderr)
             # print_exc()
 
-logging.info(f'Spooky Launch Sequence Initiated...')
+log.info(f'Spooky Launch Sequence Initiated...')
 
 bot.run(HACKTOBERBOT_TOKEN)
 
-logging.info(f'HackBot has been slain!')
\ No newline at end of file
+log.info(f'HackBot has been slain!')