This is an automated email from the ASF dual-hosted git repository. liyuheng pushed a commit to branch lyh/ainode/logger-refactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 78b7eabfaf19aa24bd59057c9342b6b0c5c93bff Author: liyuheng <[email protected]> AuthorDate: Thu Jul 31 23:27:38 2025 +0800 seems good --- .../core/inference/inference_request_pool.py | 2 +- iotdb-core/ainode/ainode/core/log.py | 46 +--------------------- .../ainode/ainode/core/{ => logger}/base_logger.py | 7 +--- 3 files changed, 4 insertions(+), 51 deletions(-) diff --git a/iotdb-core/ainode/ainode/core/inference/inference_request_pool.py b/iotdb-core/ainode/ainode/core/inference/inference_request_pool.py index 99c942a9f5f..7245d9c8bac 100644 --- a/iotdb-core/ainode/ainode/core/inference/inference_request_pool.py +++ b/iotdb-core/ainode/ainode/core/inference/inference_request_pool.py @@ -26,7 +26,7 @@ import torch import torch.multiprocessing as mp from transformers import PretrainedConfig -from ainode.core.base_logger import BaseLogger +from ainode.core.logger.base_logger import BaseLogger from ainode.core.config import AINodeDescriptor from ainode.core.inference.inference_request import InferenceRequest from ainode.core.inference.scheduler.basic_scheduler import BasicScheduler diff --git a/iotdb-core/ainode/ainode/core/log.py b/iotdb-core/ainode/ainode/core/log.py index b225dd11b4c..eddccf33191 100644 --- a/iotdb-core/ainode/ainode/core/log.py +++ b/iotdb-core/ainode/ainode/core/log.py @@ -16,54 +16,10 @@ # under the License. # -import inspect -import logging -import multiprocessing -import os -import random -import sys -import threading - -from ainode.core.base_logger import BaseLogger -from ainode.core.constant import ( - AINODE_LOG_DIR, - AINODE_LOG_FILE_LEVELS, - AINODE_LOG_FILE_NAMES, - STD_LEVEL, -) +from ainode.core.logger.base_logger import BaseLogger from ainode.core.util.decorator import singleton -class LoggerFilter(logging.Filter): - def filter(self, record): - record.msg = f"{self.custom_log_info()}: {record.msg}" - return True - - @staticmethod - def custom_log_info(): - frame = inspect.currentframe() - stack_trace = inspect.getouterframes(frame) - - pid = os.getpid() - process_name = multiprocessing.current_process().name - - stack_info = "" - frame_info = stack_trace[7] - file_name = frame_info.filename - # if file_name is not in current working directory, find the first "iotdb" in the path - for l in range(len(file_name)): - i = len(file_name) - l - 1 - if file_name[i:].startswith("iotdb/") or file_name[i:].startswith( - "iotdb\\" - ): - file_name = file_name[i:] - break - - stack_info += f"{file_name}:{frame_info.lineno}-{frame_info.function}" - - return f"[{pid}:{process_name}] {stack_info}" - - @singleton class Logger(BaseLogger): """Logger is a singleton, it will be initialized when AINodeDescriptor is inited for the first time. diff --git a/iotdb-core/ainode/ainode/core/base_logger.py b/iotdb-core/ainode/ainode/core/logger/base_logger.py similarity index 92% rename from iotdb-core/ainode/ainode/core/base_logger.py rename to iotdb-core/ainode/ainode/core/logger/base_logger.py index 09f5d42cc95..1608967fdee 100644 --- a/iotdb-core/ainode/ainode/core/base_logger.py +++ b/iotdb-core/ainode/ainode/core/logger/base_logger.py @@ -16,9 +16,7 @@ # under the License. # -import inspect import logging -import multiprocessing import os import random import sys @@ -55,10 +53,9 @@ class BaseLogger: self.console_handler.setFormatter(self.logger_format) self.logger.addHandler(self.console_handler) - # 2. 文件（按等级拆分，每天 0 点轮转） target_dir = os.path.join(AINODE_LOG_DIR, sub_dir) os.makedirs(target_dir, exist_ok=True) - os.chmod(target_dir, 0o700) # TODO 权限多少？ + os.chmod(target_dir, 0o755) for i in range(len(AINODE_LOG_FILE_NAMES)): file_name = AINODE_LOG_FILE_NAMES[i] @@ -67,7 +64,7 @@ class BaseLogger: if not os.path.exists(file_path): with open(file_path, "w", encoding="utf-8"): pass - os.chmod(file_path, 0o777) + os.chmod(file_path, 0o644) # create handler file_level = AINODE_LOG_FILE_LEVELS[i] fh = TimedRotatingFileHandler(
