ソースを参照

feat: stream log

jerry 1 ヶ月 前
親
コミット
22f524daf8
5 ファイル変更、204 行追加、12 行削除
  1. 2 1
      gco_wrapper.py
  2. 9 9
      log_macros.py
  3. 6 1
      logger_setup.py
  4. 14 1
      main.py
  5. 173 0
      utils/redis_stream_logger.py

+ 2 - 1
gco_wrapper.py

@@ -35,8 +35,9 @@ class GCOWrapper:
         self._push_callback = callback
         
     def _log(self, msg: str):
+        gid = getattr(self.m_cfg, "identifier", "")
         with self._lock:
-            VSC_INFO("-", msg)
+            VSC_INFO("-", msg, group_id=gid)
             self._log_queue.append(msg)
             for sub in self._log_subscribers:
                 try:

+ 9 - 9
log_macros.py

@@ -8,16 +8,16 @@ def set_active_logger(logger: logging.Logger):
     global _active_logger
     _active_logger = logger
 
-# --- 宏定义 (调用签名完全保持原样) ---
+# --- 宏定义 (调用签名完全保持原样,额外支持 group_id 结构化透传) ---
 
-def VSC_INFO(tag, message, *args):
-    _active_logger.info(f"[{tag}] {message}", *args)
+def VSC_INFO(tag, message, *args, group_id: str = ""):
+    _active_logger.info(f"[{tag}] {message}", *args, extra={"group_id": group_id})
 
-def VSC_DEBUG(tag, message, *args):
-    _active_logger.debug(f"[{tag}] {message}", *args)
+def VSC_DEBUG(tag, message, *args, group_id: str = ""):
+    _active_logger.debug(f"[{tag}] {message}", *args, extra={"group_id": group_id})
 
-def VSC_WARN(tag, message, *args):
-    _active_logger.warning(f"[{tag}] {message}", *args)
+def VSC_WARN(tag, message, *args, group_id: str = ""):
+    _active_logger.warning(f"[{tag}] {message}", *args, extra={"group_id": group_id})
 
-def VSC_ERROR(tag, message, *args):
-    _active_logger.error(f"[{tag}] {message}", *args)
+def VSC_ERROR(tag, message, *args, group_id: str = ""):
+    _active_logger.error(f"[{tag}] {message}", *args, extra={"group_id": group_id})

+ 6 - 1
logger_setup.py

@@ -4,7 +4,7 @@ from logging.handlers import RotatingFileHandler
 
 import log_macros  # 导入你的宏模块
 
-def setup_app_logger(app_name: str, log_dir: str = "logs") -> logging.Logger:
+def setup_app_logger(app_name: str, log_dir: str = "logs", extra_handlers=None) -> logging.Logger:
     """
     配置并返回一个标准的 Logger,支持终端输出和文件滚动保存。
     """
@@ -36,6 +36,11 @@ def setup_app_logger(app_name: str, log_dir: str = "logs") -> logging.Logger:
         logger.addHandler(console_handler)
         logger.addHandler(file_handler)
 
+    if extra_handlers:
+        for h in extra_handlers:
+            if h not in logger.handlers:
+                logger.addHandler(h)
+
     # ==========================================
     # 核心:将这个专属 Logger 注入到宏!
     # 这样整个系统里所有的 VSC_INFO 都会输出到你的 app_name.log 里!

+ 14 - 1
main.py

@@ -28,6 +28,7 @@ from utils.plugin_updater import (
     is_newer_version,
     download_and_install_plugin,
 )
+from utils.redis_stream_logger import RedisStreamLogger, RedisStreamLogHandler
 
 # 升级指令队列(由 Redis PubSub 线程推送)
 upgrade_queue = queue.Queue()
@@ -259,7 +260,15 @@ def main():
     node_id = getattr(configure, "NODE_ID", None) or os.getenv("NODE_ID", "node01")
     status_key = f"vs:status:{role}:{node_id}"
 
-    logger = setup_app_logger(role.title())
+    # 初始化 Redis Stream 日志器并挂载到主 Logger
+    stream_logger = RedisStreamLogger.initialize(
+        redis_conf=REDIS_CFG,
+        node_id=node_id,
+        role=role,
+        maxlen=2000,
+    )
+    stream_handler = RedisStreamLogHandler(stream_logger)
+    logger = setup_app_logger(role.title(), extra_handlers=[stream_handler])
     logger.info(f"{role.title()} Runner started (Node ID: '{node_id}', Cloud Mode: {use_cloud})")
 
     redis_client = SafeRedisClient(REDIS_CFG, logger.info)
@@ -362,6 +371,10 @@ def main():
                 wrapper.stop()
             except Exception as e:
                 logger.error(f"Error stopping group [{gid}]: {e}")
+        try:
+            stream_logger.close()
+        except Exception:
+            pass
 
 
 if __name__ == "__main__":

+ 173 - 0
utils/redis_stream_logger.py

@@ -0,0 +1,173 @@
+import time
+import json
+import queue
+import logging
+import threading
+from datetime import datetime, timezone
+from typing import Dict, Any, Optional
+import redis
+
+
+class RedisStreamLogger:
+    """
+    负责将节点/角色/分组运行日志异步缓冲并通过 Redis Stream 传输到后端。
+    内部采用无锁内存 Queue + 后台批处理 Daemon 线程,
+    保证网络抖动或 Redis 延迟完全不阻塞主业务逻辑(抢号/巡检)。
+    """
+    _instance: Optional["RedisStreamLogger"] = None
+    _lock = threading.Lock()
+
+    def __init__(
+        self,
+        redis_conf: Dict[str, Any],
+        node_id: str,
+        role: str,
+        maxlen: int = 2000,
+        stream_key_prefix: str = "vs:stream:logs",
+    ):
+        self.node_id = node_id
+        self.role = role
+        self.maxlen = maxlen
+        self.stream_key = f"{stream_key_prefix}:{node_id}:{role}"
+        self.redis_conf = dict(redis_conf)
+        self.redis_conf.setdefault("socket_timeout", 3.0)
+        self.redis_conf.setdefault("socket_connect_timeout", 3.0)
+        
+        self.queue: queue.Queue = queue.Queue(maxsize=10000)
+        self._stopped = False
+        self._redis_client: Optional[redis.Redis] = None
+        
+        # 启动后台守护工作线程
+        self._worker_thread = threading.Thread(
+            target=self._flusher_loop,
+            daemon=True,
+            name=f"RedisStreamLogger-{role}",
+        )
+        self._worker_thread.start()
+
+    @classmethod
+    def initialize(
+        cls,
+        redis_conf: Dict[str, Any],
+        node_id: str,
+        role: str,
+        maxlen: int = 2000,
+    ) -> "RedisStreamLogger":
+        with cls._lock:
+            if cls._instance is None:
+                cls._instance = cls(redis_conf, node_id, role, maxlen=maxlen)
+            return cls._instance
+
+    @classmethod
+    def get_instance(cls) -> Optional["RedisStreamLogger"]:
+        return cls._instance
+
+    def _get_client(self) -> redis.Redis:
+        if self._redis_client is None:
+            self._redis_client = redis.Redis(**self.redis_conf)
+        return self._redis_client
+
+    def push(
+        self,
+        message: str,
+        level: str = "INFO",
+        group_id: str = "",
+        timestamp: Optional[str] = None,
+    ):
+        """非阻塞压入待发送队列。若队列满载则丢弃旧日志,决不挂起调用方"""
+        if self._stopped:
+            return
+        if not timestamp:
+            timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
+
+        payload = {
+            "node_id": self.node_id,
+            "role": self.role,
+            "group_id": group_id or "",
+            "level": level.upper(),
+            "message": str(message),
+            "timestamp": timestamp,
+        }
+
+        try:
+            self.queue.put_nowait(payload)
+        except queue.Full:
+            try:
+                # 丢弃一条最旧的,重新入队
+                _ = self.queue.get_nowait()
+                self.queue.put_nowait(payload)
+            except Exception:
+                pass
+
+    def _flusher_loop(self):
+        batch = []
+        last_flush_time = time.time()
+
+        while not self._stopped:
+            try:
+                # 尽可能凑批,最高等待 0.2 秒
+                try:
+                    item = self.queue.get(timeout=0.2)
+                    batch.append(item)
+                    while len(batch) < 100:
+                        batch.append(self.queue.get_nowait())
+                except queue.Empty:
+                    pass
+
+                now = time.time()
+                # 满批或超时刷新
+                if batch and (len(batch) >= 20 or (now - last_flush_time >= 0.5)):
+                    self._flush_batch(batch)
+                    batch = []
+                    last_flush_time = now
+
+            except Exception:
+                time.sleep(0.5)
+
+    def _flush_batch(self, items):
+        if not items:
+            return
+        try:
+            r = self._get_client()
+            pipe = r.pipeline(transaction=False)
+            for item in items:
+                pipe.xadd(
+                    self.stream_key,
+                    item,
+                    maxlen=self.maxlen,
+                    approximate=True,
+                )
+            pipe.execute()
+        except Exception:
+            # 异常时释放连接供重试
+            self._redis_client = None
+
+    def close(self):
+        self._stopped = True
+
+
+class RedisStreamLogHandler(logging.Handler):
+    """
+    Python logging 标准 Handler,用于透明接管 logger.info / warning / error 等日志
+    """
+    def __init__(self, logger_instance: Optional[RedisStreamLogger] = None):
+        super().__init__()
+        self._logger_instance = logger_instance
+
+    def emit(self, record: logging.LogRecord):
+        try:
+            inst = self._logger_instance or RedisStreamLogger.get_instance()
+            if not inst:
+                return
+
+            msg = self.format(record) if self.formatter else record.getMessage()
+            level = record.levelname
+            group_id = getattr(record, "group_id", "")
+
+            inst.push(
+                message=msg,
+                level=level,
+                group_id=group_id,
+            )
+        except Exception:
+            self.handleError(record)