chore: 优化重连 socketio 后没有启用的问题

Author: tianxiu2b2t

core/cluster.py

@@ -179,11 +179,17 @@ async def _(message: Any):
 
         @self.sio.on("connect") # type: ignore
         async def _():
-            logger.tdebug("cluster.connected", id=self.id)
+            logger.tinfo("cluster.connected", id=self.id)
+            if not self._enabled:
+                return
+            self._enabled = False
+            logger.tinfo("cluster.reconnect", id=self.id)
+            await self.enable()
+
 
         @self.sio.on("disconnect") # type: ignore
         async def _():
-            logger.tdebug("cluster.disconnected", id=self.id)
+            logger.tinfo("cluster.disconnected", id=self.id)
 
         task_group.start_soon(self.keepalive)
 

locale/zh_cn.json

@@ -1,43 +1,44 @@
 {
+    "debug.cluster.get_files": "获取节点 [${id}] 文件列表 大小 [${size}] 数量 [${count}] 最后修改日期 [${last_modified}]",
+    "debug.cluster.refresh_token.schedule": "下一次节点 [${id}] Token 刷新将在 [${next}] 秒后进行",
+    "debug.web.forward.tls_port": "TLS 端口在 [${port}] 上开启",
+    "debug.web.uvicorn.port": "Web 服务器监听端口 [${port}]",
+    "error.cluster.enable": "节点 [${id}] 上线失败 [${err}]",
+    "error.cluster.enable.timeout": "节点 [${id}] 注册超时",
+    "error.cluster.exception": "节点 [${id}] 异常：[${msg}]",
+    "error.cluster.kicked": "节点 [${id}] 被主控踢出下线",
+    "error.cluster.refresh_token": "刷新节点 [${id}] Token 失败",
+    "error.cluster.request_cert.error": "节点 [${id}] 申请证书失败",
+    "error.core.initialize.missing": "当前加载节点数 [${clusters}] 存储数 [${storages}]",
+    "error.core.initialize.storages": "无法初始化存储",
+    "error.web.certificates": "没有可用证书",
+    "error.web.forward.pub_port": "公共端口 [${port}] 错误",
+    "error.web.tls_listener": "TLS 监听器错误",
+    "info.cluster.connected": "节点 [${id}] 已连接至主控",
+    "info.cluster.disable": "节点 [${id}] 下线",
+    "info.cluster.disconnected": "节点 [${id}] 已断开连接",
+    "info.cluster.enable": "节点 [${id}] 已上线",
+    "info.cluster.message": "节点 [${id}] 消息 [${msg}]",
+    "info.cluster.reconnect": "节点 [${id}] 与主控连接成功，恢复启用状态",
+    "info.cluster.request_cert": "请求节点 [${id}] 证书",
+    "info.cluster.retry": "节点 [${id}] 将在 [${time}s] 后尝试重新上线",
+    "info.cluster.sync.files": "获取文件列表 大小 [${size}] 数量 [${count}] 最后修改日期 [${last_modified}]",
+    "info.cluster.sync.missing_files": "当前缺失 [${count}] 文件，总计 [${size}]",
+    "info.cluster.sync.no_files": "没有新文件",
+    "info.cluster.sync.no_missing_files": "没有缺失文件",
+    "info.cluster.want_enable": "节点 [${id}] 上线",
+    "info.core.exit": "已退出",
     "info.core.initialize": "初始化中...",
-    "info.core.initialize.version": "API 版本: [${api_version}] Python OpenBMCLAPI 版本 [${version}]",
+    "info.core.initialize.cluster": "加载节点 [${id}]",
     "info.core.initialize.platform": "操作平台 [${os} ${arch}] Python 版本 [${python}]",
     "info.core.initialize.storage": "加载存储 [${name} (${type})]",
-    "info.core.initialize.cluster": "加载节点 [${id}]",
+    "info.core.initialize.version": "API 版本: [${api_version}] Python OpenBMCLAPI 版本 [${version}]",
     "info.core.initialized.storages": "已加载存储: [${count}]",
-    "info.core.exit": "已退出",
-    "info.web.forward.pub_port": "公共端口 [${port}]",
-    "info.cluster.sync.files": "获取文件列表 大小 [${size}] 数量 [${count}] 最后修改日期 [${last_modified}]",
-    "info.cluster.sync.missing_files": "当前缺失 [${count}] 文件，总计 [${size}]",
-    "info.cluster.sync.no_missing_files": "没有缺失文件",
-    "info.cluster.sync.no_files": "没有新文件",
     "info.download.configuration": "下载来源 [${source}] 并发 [${concurrency}]",
-    "info.cluster.request_cert": "请求节点 [${id}] 证书",
     "info.web.access_log": "${host} - ${address} | ${total_time} | ${method} ${status} | ${path} - ${user_agent}",
-    "info.cluster.disable": "节点 [${id}] 下线",
-    "info.cluster.want_enable": "节点 [${id}] 上线",
-    "info.cluster.enable": "节点 [${id}] 已上线",
-    "info.cluster.message": "节点 [${id}] 消息 [${msg}]",
-    "info.cluster.retry": "节点 [${id}] 将在 [${time}s] 后尝试重新上线",
     "info.web.byoc": "证书类型 [${type}]",
+    "info.web.forward.pub_port": "公共端口 [${port}]",
     "success.cluster.keepalive": "节点 [${id}] 服务了 [${hits}] 个文件 总计 [${bytes}iB] 延迟 [${delay}ms]",
-    "error.core.initialize.storages": "无法初始化存储",
-    "error.core.initialize.missing": "当前加载节点数 [${clusters}] 存储数 [${storages}]",
-    "error.web.forward.pub_port": "公共端口 [${port}] 错误",
-    "error.cluster.refresh_token": "刷新节点 [${id}] Token 失败",
-    "error.cluster.exception": "节点 [${id}] 异常：[${msg}]",
-    "error.cluster.request_cert.error": "节点 [${id}] 申请证书失败",
-    "error.cluster.enable": "节点 [${id}] 上线失败 [${err}]",
-    "error.cluster.enable.timeout": "节点 [${id}] 注册超时",
-    "error.web.certificates": "没有可用证书",
-    "error.web.tls_listener": "TLS 监听器错误",
-    "error.cluster.kicked": "节点 [${id}] 被主控踢出下线",
-    "warning.cluster.warden": "节点 [${id}] 巡检：[${msg}]",
     "warning.cluster.keepalive": "节点 [${id}] 保活失败 (${failed}/3)",
-    "debug.web.uvicorn.port": "Web 服务器监听端口 [${port}]",
-    "debug.web.forward.tls_port": "TLS 端口在 [${port}] 上开启",
-    "debug.cluster.refresh_token.schedule": "下一次节点 [${id}] Token 刷新将在 [${next}] 秒后进行",
-    "debug.cluster.get_files": "获取节点 [${id}] 文件列表 大小 [${size}] 数量 [${count}] 最后修改日期 [${last_modified}]",
-    "debug.cluster.connected": "节点 [${id}] 已连接至主控",
-    "debug.cluster.disconnected": "节点 [${id}] 已断开连接"
-}
+    "warning.cluster.warden": "节点 [${id}] 巡检：[${msg}]"
+  }