From 0731a130bca7b2884053f31858eb80c3c20b8497 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Wed, 13 Dec 2023 11:29:14 +0800 Subject: [PATCH] Update more info --- Difficult_Rocket/__init__.py | 10 +++++----- config/lndl-logger.toml | 9 ++++++++- libs/lib_not_dr | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Difficult_Rocket/__init__.py b/Difficult_Rocket/__init__.py index 8f548eb..7211c6e 100644 --- a/Difficult_Rocket/__init__.py +++ b/Difficult_Rocket/__init__.py @@ -83,6 +83,7 @@ def load_logging(): import rtoml + warn_config = False if not log_config_path.is_file(): # 生成默认配置文件 from Difficult_Rocket.data import log_config @@ -90,6 +91,7 @@ def load_logging(): log_config_path.write_text(log_config.default_config) except (FileNotFoundError, OSError, PermissionError): print("\033[31mFailed to write default log config file\033[0m") + warn_config = True logger_config = rtoml.loads(log_config.default_config) else: # 读取配置文件 @@ -100,12 +102,10 @@ def load_logging(): read_config(logger_config) from lib_not_dr.loggers.config import get_logger logger = get_logger("main") - print("Logger config loaded") - print(logger.as_markdown()) - print(logger.outputs[0].as_markdown()) - print(logger.outputs[0].formatter.as_markdown()) logger.info("Logger config loaded", tag='DR-init') - logger.info(f"DR status: {DR_status}", tag='DR-init') + logger.info(f"DR status:\n{DR_status.as_markdown()}", tag='DR-init') + if warn_config: + logger.warn("Failed to load log config file, use default config", tag='DR-init') # 读取日志配置 diff --git a/config/lndl-logger.toml b/config/lndl-logger.toml index ee40c0e..2512ab3 100644 --- a/config/lndl-logger.toml +++ b/config/lndl-logger.toml @@ -38,6 +38,13 @@ config_version = 1 [Formatter.std_formatter] class = "StdFormatter" + enable_color = true + sub_formatter = ["main_formatter"] + default_template = "[${log_time}][${level}]|${logger_name}:${logger_tag}|${messages}" + + [Formatter.file_std_formatter] + class = "StdFormatter" + enable_color = false sub_formatter = ["main_formatter"] default_template = "[${log_time}][${level}]|${logger_name}:${logger_tag}|${messages}" @@ -60,7 +67,7 @@ config_version = 1 level = 10 # or level_name = 'DEBUG' # or level_name = 'debug' - formatter = "std_formatter" + formatter = "file_std_formatter" flush_count_limit = 10 # 5 条日志刷新一次 flush_time_limit = 5 diff --git a/libs/lib_not_dr b/libs/lib_not_dr index 4fa5089..91d70dd 160000 --- a/libs/lib_not_dr +++ b/libs/lib_not_dr @@ -1 +1 @@ -Subproject commit 4fa50898199bad9b97530373a15dc575e4024000 +Subproject commit 91d70dd3322806d983b78ffeec8a6621504268fd