feat: 实现统一的错误处理机制和增强日志系统
添加错误码定义和统一响应格式 增强日志记录功能,支持模块专用日志记录器 实现全局异常捕获和友好错误提示 更新文档说明错误处理机制
This commit is contained in:
@@ -8,7 +8,9 @@ from pathlib import Path
|
||||
import tomllib
|
||||
from pydantic import ValidationError
|
||||
from .config_models import ConfigModel, NapCatWSModel, BotModel, RedisModel, DockerModel
|
||||
from .utils.logger import logger
|
||||
from .utils.logger import logger, ModuleLogger
|
||||
from .utils.exceptions import ConfigError, ConfigNotFoundError, ConfigValidationError
|
||||
from .utils.error_codes import ErrorCode, create_error_response
|
||||
|
||||
|
||||
class Config:
|
||||
@@ -24,36 +26,66 @@ class Config:
|
||||
"""
|
||||
self.path = Path(file_path)
|
||||
self._model: ConfigModel
|
||||
# 创建模块专用日志记录器
|
||||
self.logger = ModuleLogger("ConfigLoader")
|
||||
self.load()
|
||||
|
||||
def load(self):
|
||||
"""
|
||||
加载并验证配置文件
|
||||
|
||||
:raises FileNotFoundError: 如果配置文件不存在
|
||||
:raises ValidationError: 如果配置格式不正确
|
||||
:raises ConfigNotFoundError: 如果配置文件不存在
|
||||
:raises ConfigValidationError: 如果配置格式不正确
|
||||
:raises ConfigError: 如果加载配置时发生其他错误
|
||||
"""
|
||||
if not self.path.exists():
|
||||
logger.error(f"配置文件 {self.path} 未找到!")
|
||||
raise FileNotFoundError(f"配置文件 {self.path} 未找到!")
|
||||
error = ConfigNotFoundError(message=f"配置文件 {self.path} 未找到!")
|
||||
self.logger.error(f"配置加载失败: {error.message}")
|
||||
self.logger.log_custom_exception(error)
|
||||
raise error
|
||||
|
||||
try:
|
||||
logger.info(f"正在从 {self.path} 加载配置...")
|
||||
self.logger.info(f"正在从 {self.path} 加载配置...")
|
||||
with open(self.path, "rb") as f:
|
||||
raw_config = tomllib.load(f)
|
||||
|
||||
self._model = ConfigModel(**raw_config)
|
||||
logger.success("配置加载并验证成功!")
|
||||
self.logger.success("配置加载并验证成功!")
|
||||
|
||||
except ValidationError as e:
|
||||
logger.error("配置验证失败,请检查 `config.toml` 文件中的以下错误:")
|
||||
error_details = []
|
||||
for error in e.errors():
|
||||
field = " -> ".join(map(str, error["loc"]))
|
||||
logger.error(f" - 字段 '{field}': {error['msg']}")
|
||||
raise
|
||||
error_msg = f"字段 '{field}': {error['msg']}"
|
||||
error_details.append(error_msg)
|
||||
|
||||
validation_error = ConfigValidationError(
|
||||
message="配置验证失败",
|
||||
original_error=e
|
||||
)
|
||||
|
||||
self.logger.error("配置验证失败,请检查 `config.toml` 文件中的以下错误:")
|
||||
for detail in error_details:
|
||||
self.logger.error(f" - {detail}")
|
||||
|
||||
self.logger.log_custom_exception(validation_error)
|
||||
raise validation_error
|
||||
except tomllib.TOMLDecodeError as e:
|
||||
error = ConfigError(
|
||||
message=f"TOML解析错误: {str(e)}",
|
||||
original_error=e
|
||||
)
|
||||
self.logger.error(f"加载配置文件时发生TOML解析错误: {error.message}")
|
||||
self.logger.log_custom_exception(error)
|
||||
raise error
|
||||
except Exception as e:
|
||||
logger.exception(f"加载配置文件时发生未知错误: {e}")
|
||||
raise
|
||||
error = ConfigError(
|
||||
message=f"加载配置文件时发生未知错误: {str(e)}",
|
||||
original_error=e
|
||||
)
|
||||
self.logger.exception(f"加载配置文件时发生未知错误: {error.message}")
|
||||
self.logger.log_custom_exception(error)
|
||||
raise error
|
||||
|
||||
# 通过属性访问配置
|
||||
@property
|
||||
|
||||
Reference in New Issue
Block a user