From cf95ed88be14e6a9410192b7164319145dd55b36 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Thu, 16 Aug 2018 19:46:07 +0200
Subject: [PATCH] ???

---
 discordbot.py  | 22 +++++++++++-----------
 telegrambot.py | 13 +++++++------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/discordbot.py b/discordbot.py
index b042a0af..7de5cbe2 100644
--- a/discordbot.py
+++ b/discordbot.py
@@ -24,7 +24,8 @@ import datetime
 import sqlalchemy.exc
 
 logging.getLogger().setLevel(level=logging.ERROR)
-logging.getLogger(__name__).setLevel(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+logger.setLevel(level=logging.DEBUG)
 
 # Queue emojis
 queue_emojis = [":one:",
@@ -109,7 +110,7 @@ executor = concurrent.futures.ThreadPoolExecutor(max_workers=3)
 # Init the Sentry client
 sentry = raven.Client(config["Sentry"]["token"],
                       release=version,
-                      install_logging_hook=False,
+                      install_logger_hook=False,
                       hook_libraries=[])
 
 
@@ -332,7 +333,7 @@ class RoyalDiscordBot(discord.Client):
 
     async def on_error(self, event_method, *args, **kwargs):
         ei = sys.exc_info()
-        logging.error(f"Critical error: {repr(ei[1])}")
+        logger.error(f"Critical error: {repr(ei[1])}")
         try:
             await self.main_channel.send(f"☢️ **ERRORE CRITICO NELL'EVENTO** `{event_method}`\n"
                                          f"Il bot si è chiuso e si dovrebbe riavviare entro qualche minuto.\n"
@@ -344,7 +345,7 @@ class RoyalDiscordBot(discord.Client):
             await self.change_presence(status=discord.Status.invisible)
             await self.close()
         except Exception as e:
-            logging.error("Double critical error: {repr(sys.exc_info())}")
+            logger.error("Double critical error: {repr(sys.exc_info())}")
         loop.stop()
         sentry.captureException(exc_info=ei)
         exit(1)
@@ -727,21 +728,20 @@ class RoyalDiscordBot(discord.Client):
         pass
 
 
-
 def process(users_connection=None):
-    logging.info("Initializing the bot...")
+    logger.info("Initializing the bot...")
     bot = RoyalDiscordBot()
     if users_connection is not None:
-        logging.info("Initializing Telegram-Discord connection...")
+        logger.info("Initializing Telegram-Discord connection...")
         asyncio.ensure_future(bot.feed_pipe(users_connection))
-    logging.info("Logging in...")
+    logger.info("Logging in...")
     loop.run_until_complete(bot.login(config["Discord"]["bot_token"], bot=True))
-    logging.info("Connecting...")
+    logger.info("Connecting...")
     try:
         loop.run_until_complete(bot.connect())
     except KeyboardInterrupt:
-        logging.info("Now stopping...")
-        loop.run_until_complete(self.logout())
+        logger.info("Now stopping...")
+        loop.run_until_complete(bot.logout())
         exit(0)
 
 
diff --git a/telegrambot.py b/telegrambot.py
index e7be6543..95f39430 100644
--- a/telegrambot.py
+++ b/telegrambot.py
@@ -25,7 +25,8 @@ except Exception:
     model = None
 
 logging.getLogger().setLevel(level=logging.ERROR)
-logging.getLogger(__name__).setLevel(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+logger.setLevel(level=logging.DEBUG)
 
 # Init the config reader
 config = configparser.ConfigParser()
@@ -621,7 +622,7 @@ def process(arg_discord_connection):
     u.dispatcher.add_handler(CommandHandler("calendar", cmd_calendar))
     u.dispatcher.add_handler(CommandHandler("markov", cmd_markov))
     u.dispatcher.add_handler(CallbackQueryHandler(on_callback_query))
-    logging.info("Handlers registered.")
+    logger.info("Handlers registered.")
     u.bot.send_message(config["Telegram"]["main_group"],
                        f"ℹ Royal Bot avviato e pronto a ricevere comandi!\n"
                        f"Ultimo aggiornamento: `{version}: {commit_msg}`",
@@ -629,14 +630,14 @@ def process(arg_discord_connection):
     while True:
         try:
             u.start_polling()
-            logging.info("Polling started.")
+            logger.info("Polling started.")
             u.idle()
         except telegram.error.TimedOut:
-            logging.warning("Timed out, restarting in 1 minute.")
+            logger.warning("Timed out, restarting in 1 minute.")
             time.sleep(60)
-            logging.info("Now restarting...")
+            logger.info("Now restarting...")
         except KeyboardInterrupt:
-            logging.info("Now stopping...")
+            logger.info("Now stopping...")
             break