From daf085ff9eb4c2812b6e86ae3d5f3ce131031246 Mon Sep 17 00:00:00 2001 From: Oleg A Date: Wed, 6 Oct 2021 00:59:04 +0300 Subject: [PATCH] chore: show callback_query.data in logging (#714) --- aiogram/contrib/middlewares/logging.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/aiogram/contrib/middlewares/logging.py b/aiogram/contrib/middlewares/logging.py index 82c2b50a..edf53f8c 100644 --- a/aiogram/contrib/middlewares/logging.py +++ b/aiogram/contrib/middlewares/logging.py @@ -89,13 +89,15 @@ class LoggingMiddleware(BaseMiddleware): async def on_pre_process_callback_query(self, callback_query: types.CallbackQuery, data: dict): if callback_query.message: + message = callback_query.message text = (f"Received callback query [ID:{callback_query.id}] " f"from user [ID:{callback_query.from_user.id}] " - f"for message [ID:{callback_query.message.message_id}] " - f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]") + f"for message [ID:{message.message_id}] " + f"in chat [{message.chat.type}:{message.chat.id}]" + f"with data: {callback_query.data}") - if callback_query.message.from_user: - text += f" originally posted by user [ID:{callback_query.message.from_user.id}]" + if message.from_user: + text = f"{text} originally posted by user [ID:{message.from_user.id}]" self.logger.info(text) @@ -106,14 +108,16 @@ class LoggingMiddleware(BaseMiddleware): async def on_post_process_callback_query(self, callback_query, results, data: dict): if callback_query.message: + message = callback_query.message text = (f"{HANDLED_STR[bool(len(results))]} " f"callback query [ID:{callback_query.id}] " f"from user [ID:{callback_query.from_user.id}] " - f"for message [ID:{callback_query.message.message_id}] " - f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]") + f"for message [ID:{message.message_id}] " + f"in chat [{message.chat.type}:{message.chat.id}] " + f"with data: {callback_query.data}") - if callback_query.message.from_user: - text += f" originally posted by user [ID:{callback_query.message.from_user.id}]" + if message.from_user: + text = f"{text} originally posted by user [ID:{message.from_user.id}]" self.logger.info(text)