diff --git a/kirami/config/__init__.py b/kirami/config/__init__.py index 70e2065..7f99af8 100644 --- a/kirami/config/__init__.py +++ b/kirami/config/__init__.py @@ -25,8 +25,5 @@ server_config = kirami_config.server """服务器相关配置""" -log_config = kirami_config.log -"""日志相关配置""" - database_config = kirami_config.database """数据库相关配置""" diff --git a/kirami/config/config.py b/kirami/config/config.py index 8c9a45f..4c6f5d1 100644 --- a/kirami/config/config.py +++ b/kirami/config/config.py @@ -66,11 +66,6 @@ def load_config(cls, namespace: str | None = None) -> Self: return cls(**cls.__raw_config__.get(namespace, {})) -class LogConfig(BaseConfig): - log_expire_timeout: int = 7 - """日志文件过期时间""" - - class DatabaseConfig(BaseConfig): """ MongoDB 数据库配置 @@ -164,10 +159,13 @@ class BotConfig(BaseConfig): """是否以调试模式运行 KiramiBot""" log_level: LevelName | int = "INFO" - """配置 KiramiBot 日志输出等级,可以为 `int` 类型等级或等级名称,参考 [loguru 日志等级](https://loguru.readthedocs.io/en/stable/api/logger.html#levels)""" + """日志输出等级,可以为 `int` 类型等级或等级名称,参考 [loguru 日志等级](https://loguru.readthedocs.io/en/stable/api/logger.html#levels)""" log_file: LevelName | tuple[LevelName] = "ERROR" - """KiramiBot 的日志保存等级,必须为等级名称""" + """日志保存等级,必须为等级名称""" + + log_expire_timeout: int = 7 + """日志文件过期时间""" api_root: dict[str, str] = {} """以机器人 ID 为键,上报地址为值的字典""" @@ -241,9 +239,6 @@ class KiramiConfig(BaseConfig): server: ServerConfig """服务器相关配置""" - log: LogConfig - """日志相关配置""" - database: DatabaseConfig """数据库相关配置""" diff --git a/kirami/log.py b/kirami/log.py index d40943a..6ac3438 100644 --- a/kirami/log.py +++ b/kirami/log.py @@ -26,7 +26,7 @@ from rich.theme import Theme from rich.traceback import install -from kirami.config import LOG_DIR, bot_config, log_config +from kirami.config import LOG_DIR, bot_config if TYPE_CHECKING: from loguru import Logger as LoggerType @@ -207,7 +207,7 @@ def __call__(self, record: "Record") -> bool: "rotation": "00:00", "enqueue": True, "encoding": "utf-8", - "retention": f"{log_config.log_expire_timeout} days", + "retention": f"{bot_config.log_expire_timeout} days", }