update

dnfs/log_client.py

@@ -1,8 +1,7 @@
-"""
-统一日志客户端 — 各服务共用。
+"""统一日志客户端 — 各服务共用（dnfs / smtp / static 三份副本内容一致，改动请同步）。
 
 设计要点：
-  - 通过 pymsg TCP 调用 dbv2 execute 路由，逐条 INSERT 到 Logs 表
+  - 通过 pymsg RPC 调用 dbv2 execute 路由，逐条 INSERT 到 Logs 表
   - 异步非阻塞：内存队列 + 后台线程批量推送，不拖慢业务
   - fail-safe：db 服务不可用时静默丢弃，绝不影响业务
   - 缓冲批量：队列满 50 条或超时 2 秒时自动 flush
@@ -26,12 +25,12 @@ import atexit
 from datetime import datetime, timezone
 
 _sys.path.insert(0, _os.path.join(_os.path.dirname(__file__), ".."))
-from pymsg import MsgClient  # noqa: E402
+from pymsg import RpcClient, RpcError  # noqa: E402
 
 # ── 配置 ──────────────────────────────────────────────────────────────
 
-_DBV2_ADDR = '127.0.0.1'
-_DBV2_PORT = 8005
+_DBV2_ADDR = _os.environ.get('DB_HOST', '127.0.0.1')
+_DBV2_PORT = int(_os.environ.get('DB_PORT', '8005'))
 
 _BATCH_SIZE = 50         # 队列满 50 条时 flush
 _FLUSH_INTERVAL = 2.0    # 超时 2 秒强制 flush
@@ -41,8 +40,10 @@ _TIMEOUT = 5             # socket 超时（秒）
 class LogClient:
     """异步批量日志推送客户端。"""
 
-    def __init__(self, batch_size=_BATCH_SIZE,
+    def __init__(self, service_name="log",
+                 batch_size=_BATCH_SIZE,
                  flush_interval=_FLUSH_INTERVAL):
+        self._service_name = service_name
         self._batch_size = batch_size
         self._flush_interval = flush_interval
         self._queue = queue.Queue()
@@ -133,35 +134,33 @@ class LogClient:
             self._send(batch)
 
     def _send(self, batch):
-        """通过 pymsg 使用 execute 路由逐条 INSERT 到 dbv2 Logs 表。"""
+        """通过 pymsg RPC（execute 路由）逐条 INSERT 到 dbv2 Logs 表。"""
         now = datetime.now(timezone.utc).isoformat()
-        try:
-            client = MsgClient(_DBV2_ADDR, _DBV2_PORT, "dnfs-log")
-            for entry in batch:
-                extra_val = entry.get("extra")
-                payload = {
-                    "_route": "execute",
-                    "action": "insert",
-                    "table": "Logs",
-                    "values": {
-                        "ts": now,
-                        "service": entry.get("service"),
-                        "level": entry.get("level"),
-                        "message": entry.get("message"),
-                        "trace_id": entry.get("trace_id"),
-                        "extra": json.dumps(extra_val, ensure_ascii=False)
-                        if extra_val is not None else None,
-                    },
-                }
-                resp = client.call(json.dumps(payload), timeout=_TIMEOUT)
-                resp_obj = json.loads(resp)
-                if not resp_obj.get("success"):
-                    import sys
-                    print(f"[log_client] INSERT 失败: {resp_obj.get('error')}",
-                          file=sys.stderr)
-        except Exception as e:
-            import sys
-            print(f"[log_client] 发送失败: {e}", file=sys.stderr)
+        client = RpcClient(_DBV2_ADDR, _DBV2_PORT, self._service_name + "-log")
+        for entry in batch:
+            extra_val = entry.get("extra")
+            payload = {
+                "action": "insert",
+                "table": "Logs",
+                "values": {
+                    "ts": now,
+                    "service": entry.get("service"),
+                    "level": entry.get("level"),
+                    "message": entry.get("message"),
+                    "trace_id": entry.get("trace_id"),
+                    "extra": json.dumps(extra_val, ensure_ascii=False)
+                    if extra_val is not None else None,
+                },
+            }
+            try:
+                client.call("execute", payload, timeout=_TIMEOUT)
+            except RpcError as e:
+                # 业务错误（如表结构不符）：打印后继续下一条
+                print(f"[log_client] INSERT 失败: {e}", file=_sys.stderr)
+            except Exception as e:
+                # 网络错误：db 不可用，放弃本批剩余（fail-safe）
+                print(f"[log_client] 发送失败: {e}", file=_sys.stderr)
+                break
 
     def _shutdown(self):
         """进程退出时 flush 剩余日志。"""