Remove: del Todo

This commit is contained in:
Aqr-K
2025-01-03 13:15:00 +08:00
parent cea77bddee
commit 3775e99b02

View File

@@ -1,6 +1,5 @@
import inspect
import logging
import os
from logging.handlers import RotatingFileHandler
from pathlib import Path
from typing import Dict, Any, Optional
@@ -132,12 +131,11 @@ class LoggerManager:
return caller_name or "log.py", plugin_name
@staticmethod
def __setup_logger(log_file: str, plugin_name: str = None):
def __setup_logger(log_file: str):
"""
设置日志
:param log_file日志文件相对路径
:param plugin_name: 插件名称
"""
log_file_path = log_settings.LOG_PATH / log_file
log_file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -148,20 +146,6 @@ class LoggerManager:
if log_settings.DEBUG:
_logger.setLevel(logging.DEBUG)
# Todo: 允许每个插件设置独立的日志级别,用于单个插件的调试,不必使用全局影响全局日志级别,产生大量无用日志
# elif plugin_name:
# # 从数据库中获取插件的日志等级不存在则用None
# plugin_log_level =
#
# # 插件日志等级存在且合法,则使用插件日志等级
# if plugin_log_level and plugin_log_level.upper() in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']:
# loglevel = getattr(logging, plugin_log_level.upper(), logging.INFO)
# _logger.setLevel(loglevel)
# # 插件日志等级不存在,则使用全局日志等级
# else:
# loglevel = getattr(logging, log_settings.LOG_LEVEL.upper(), logging.INFO)
# _logger.setLevel(loglevel)
# 全局日志等级
else:
loglevel = getattr(logging, log_settings.LOG_LEVEL.upper(), logging.INFO)
@@ -200,13 +184,8 @@ class LoggerManager:
# 移除已有的 handler避免重复添加
for handler in _logger.handlers:
_logger.removeHandler(handler)
plugin_name = None
# 如果不是默认日志文件,则拆分出插件名称
if log_file != self._default_log_file:
log_file_name = os.path.basename(log_file)
plugin_name = os.path.splitext(log_file_name)[0]
# 重新设置日志实例
_new_logger = self.__setup_logger(log_file=log_file, plugin_name=plugin_name)
_new_logger = self.__setup_logger(log_file=log_file)
_new_loggers[log_file] = _new_logger
self._loggers = _new_loggers
@@ -230,7 +209,7 @@ class LoggerManager:
# 获取调用者的模块的logger
_logger = self._loggers.get(logfile)
if not _logger:
_logger = self.__setup_logger(log_file=logfile, plugin_name=plugin_name)
_logger = self.__setup_logger(log_file=logfile)
self._loggers[logfile] = _logger
# 调用logger的方法打印日志
if hasattr(_logger, method):