From 834a63f5e6bfbb66484beb4c173eb017826aaf9d Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 26 Sep 2024 17:40:13 +0300 Subject: [PATCH] less-log --- main.py | 62 +++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/main.py b/main.py index 66d105b..9c14a81 100644 --- a/main.py +++ b/main.py @@ -1,11 +1,8 @@ import asyncio import logging -import signal -import sys -from aiohttp import ClientSession from handlers.messages_routing import messages_routing from handlers.handle_join_request import handle_join_request, handle_reaction_on_request -from bot.config import BOT_TOKEN, FEEDBACK_CHAT_ID +from bot.config import FEEDBACK_CHAT_ID from bot.api import telegram_api logging.basicConfig(level=logging.DEBUG) @@ -15,38 +12,37 @@ state = dict() async def start(): logger.info("\n\npolling started\n\n") - async with ClientSession() as session: - offset = 0 # init offset - while True: - response = await telegram_api("getUpdates", offset=offset, allowed_updates=['message', 'message_reaction', 'chat_join_request']) - # logger.debug(response) - if isinstance(response, dict): - result = response.get("result", []) - for update in result: - try: - message = update.get("message", update.get("edited_message")) - join_chat_request = update.get("join_chat_request") - message_reaction = update.get("join_chat_request") - if message: - logger.debug(f"chat: {message.get("chat", message.get("chat_id"))}") - await messages_routing(message, state) - elif join_chat_request: - await handle_join_request(join_chat_request) - elif message_reaction: - await handle_reaction_on_request(message_reaction) + offset = 0 # init offset + while True: + response = await telegram_api("getUpdates", offset=offset, allowed_updates=['message', 'message_reaction', 'chat_join_request']) + # logger.debug(response) + if isinstance(response, dict): + result = response.get("result", []) + for update in result: + try: + message = update.get("message", update.get("edited_message")) + join_chat_request = update.get("join_chat_request") + message_reaction = update.get("join_chat_request") + if message: + # logger.debug(f"chat: {message.get("chat", message.get("chat_id"))}") + await messages_routing(message, state) + elif join_chat_request: + await handle_join_request(join_chat_request) + elif message_reaction: + await handle_reaction_on_request(message_reaction) - except Exception as e: - logger.error(e) - import traceback - text = traceback.format_exc() - await telegram_api("sendMessage", chat_id=FEEDBACK_CHAT_ID, text=text) + except Exception as e: + logger.error(e) + import traceback + text = traceback.format_exc() + await telegram_api("sendMessage", chat_id=FEEDBACK_CHAT_ID, text=text) - offset = update["update_id"] + 1 + offset = update["update_id"] + 1 - await asyncio.sleep(1.0) - else: - logger.error(' \n\n\n!!! getUpdates polling error\n\n\n') - await asyncio.sleep(30.0) + await asyncio.sleep(1.0) + else: + logger.error(' \n\n\n!!! getUpdates polling error\n\n\n') + await asyncio.sleep(30.0) if __name__ == "__main__":