From 124606fdcbc5d4a2a34d6919c731324575d8acb4 Mon Sep 17 00:00:00 2001 From: _run Date: Mon, 11 Jul 2022 23:22:11 +0500 Subject: [PATCH] Extend exception handler behaviour with middlewares --- telebot/__init__.py | 9 ++++----- telebot/async_telebot.py | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/telebot/__init__.py b/telebot/__init__.py index 09b3002..531cda4 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -3964,11 +3964,10 @@ class TeleBot: except Exception as e: handler_error = e - if not middlewares: - if self.exception_handler: - return self.exception_handler.handle(e) - logging.error(str(e)) - return + if self.exception_handler: + self.exception_handler.handle(e) + else: logging.error(str(e)) + if middlewares: for middleware in middlewares: middleware.post_process(message, data, handler_error) diff --git a/telebot/async_telebot.py b/telebot/async_telebot.py index 35c2da8..7f49049 100644 --- a/telebot/async_telebot.py +++ b/telebot/async_telebot.py @@ -319,11 +319,10 @@ class AsyncTeleBot: except Exception as e: handler_error = e - if not middlewares: - if self.exception_handler: - return self.exception_handler.handle(e) - logging.error(str(e)) - return + if self.exception_handler: + self.exception_handler.handle(e) + else: logging.error(str(e)) + if middlewares: for middleware in middlewares: