feat: Настройка логирования по записи в файл

С помощью bind и фильтра каждый логер будет писать в свой файл

Author: A-V-tor

Makefile

@@ -1,4 +1,5 @@
 fill_db:
+	poetry shell
 	python scripts/add_records_in_db.py
 deploy:
 	python scripts/dokku/deploy.py

config.py

@@ -1,4 +1,8 @@
+import inspect
+import logging
 import os
+import sys
+from typing import Optional, Union
 
 from dotenv import find_dotenv, load_dotenv
 from loguru import logger
@@ -7,24 +11,65 @@
 basedir = os.path.abspath(os.path.dirname(__file__))
 
 
+class InterceptHandler(logging.Handler):
+    """
+    Обработчик (из документации `loguru`) ловит все сообщения от стандартного `logging` и передаёт их в `loguru`.
+    """
+
+    def emit(self, record: logging.LogRecord) -> None:
+        # Get corresponding Loguru level if it exists.
+        level: Union[str, int]
+        try:
+            level = logger.level(record.levelname).name
+        except ValueError:
+            level = record.levelno
+
+        # Find caller from where originated the logged message.
+        frame, depth = inspect.currentframe(), 0
+        while frame and (depth == 0 or frame.f_code.co_filename == logging.__file__):
+            frame = frame.f_back
+            depth += 1
+
+        logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
+
+
 def get_config():
     """Получение настроек проекта."""
     env = os.getenv('FLASK_ENV', 'production')
+    logging.basicConfig(handlers=[InterceptHandler()], level=0, force=True)
     if env == 'development':
-        return DevelopConfig
+        return DevelopConfig()
     else:
-        return ProductionConfig
+        return ProductionConfig()
 
 
 class LoggerConfig:
     logger = logger
 
-    def __init__(self, file_name) -> None:
+    def custom_filter(self, record: dict):
+        """
+        Фильтрация записи в файл.
+        """
+        return True if self.file_name == record.get('extra').get('logger') else False
+
+    def __init__(
+        self,
+        file_name,
+        extra_format='{extra[logger]} {message}',
+    ) -> None:
+        self.file_name = file_name
+
+        custom_filter = self.custom_filter
+
         self.logger.add(
             f'logs/{file_name}.log',
             backtrace=True,
             diagnose=True,
             rotation='20 MB',
+            retention=5,
+            format=extra_format,
+            filter=custom_filter,
+            enqueue=True,
         )
 
 
@@ -56,12 +101,14 @@ class DevelopConfig:
 
     BOT_TOKEN = os.getenv('token')
     URL_ADMIN = os.getenv('URL_ADMIN')
-    web_logger = LoggerConfig('test-web').logger
-    bot_logger = LoggerConfig('test-bot').logger
 
     def __name__(self):
         return 'DevelopConfig'
 
+    def __init__(self) -> None:
+        self.web_logger = LoggerConfig('web', '{extra[logger]} {message}').logger.bind(logger='web')
+        self.bot_logger = LoggerConfig('bot', '{extra[logger]} {message}').logger.bind(logger='bot')
+
 
 class ProductionConfig:
     DASHBOARD_EXPENSE = os.getenv('DASHBOARD_EXPENSE')
@@ -76,11 +123,12 @@ class ProductionConfig:
     BOT_TOKEN = os.getenv('token')
     URL_ADMIN = os.getenv('URL_ADMIN')
 
-    web_logger = LoggerConfig('web').logger
-    bot_logger = LoggerConfig('bot').logger
-
     def __name__(self):
         return 'ProductionConfig'
 
+    def __init__(self) -> None:
+        self.web_logger = LoggerConfig('web', '{extra[logger]} {message}').logger.bind(logger='web')
+        self.bot_logger = LoggerConfig('bot', '{extra[logger]} {message}').logger.bind(logger='bot')
+
 
 settings = get_config()

main.py

@@ -1,6 +1,11 @@
 import subprocess
 from concurrent.futures import ProcessPoolExecutor
 
+from config import settings
+
+web_logger = settings.web_logger
+bot_logger = settings.bot_logger
+
 
 def start_web():
     subprocess.call(['gunicorn', '--bind', '0.0.0.0:5000', '-w 4', 'web_app:app'])
@@ -13,7 +18,9 @@ def start_bot():
 def main():
     with ProcessPoolExecutor() as pool:
         pool.submit(start_bot)
+        bot_logger.info('🔘 Запуск бота')
         pool.submit(start_web)
+        web_logger.info('🌐 Запуск админки')
 
 
 if __name__ == '__main__':

src/telegram/handlers/weight.py

@@ -22,7 +22,7 @@ async def root_weight_menu(callback: types.CallbackQuery, state: FSMContext):
     weight_manager = WeightTelegramService(callback)
     result = await weight_manager.check_note()
     presence_of_record = True if result else False
-    msg = f'Твой вес сегодня: <b>{result.value}</b>' if result else 'Журнал веса'
+    msg = f'Твой вес сегодня: <b>{result.value}</b>' if result else 'Журнал веса на сегодня пуст'
 
     if presence_of_record:
         await state.set_data({'weight_note_id': result.id})

src/webapp/dashbords/weight.py

@@ -13,14 +13,13 @@
 from src.services.weight import WeightDashbordService
 from src.webapp.dashbords.base import DashboardManager, StyleDash
 
-logger = settings.bot_logger
+logger = settings.web_logger
 
 
 def get_weight_analytics(current_flask_app):
     def show_content():
         """Получение и отрисовка данных."""
         weight_manager = WeightDashbordService(current_user.telegram_id)
-
         data_weight = weight_manager.get_all_weight_by_telegram_id()
         list_timestamp = sorted(set([i[1] for i in data_weight]))