fix: 修复上线失败没有重新尝试

Author: tianxiu2b2t

core/cluster.py

@@ -443,7 +443,7 @@ async def start(self):
         public_host = cert.host
 
         logger.tdebug("cluster.debug.public_host", host=public_host, port=public_port)
-        
+
         # check files
         await self.file_manager.sync()
 
@@ -592,6 +592,7 @@ async def enable(self):
         self.want_enable = False
         if result.err:
             self.socketio_error("enable", result)
+            self.retry()
             return
         self.enabled = True
         scheduler.cancel(self.keepalive_task)
@@ -636,8 +637,11 @@ async def disable(self, exit: bool = False):
         self.want_enable = False
         self.enabled = False
         if not exit:
-            self.delay_enable_task = scheduler.run_later(self.enable, 60)
-            logger.tinfo("cluster.info.cluster.retry_enable", delay=units.format_count_datetime(60))
+            self.retry()
+
+    def retry(self):
+        self.delay_enable_task = scheduler.run_later(self.enable, 60)
+        logger.tinfo("cluster.info.cluster.retry_enable", delay=units.format_count_datetime(60))
 
 
     @property
@@ -651,9 +655,9 @@ def certificate(self):
     def socketio_error(self, type: str, result: 'SocketIOEmitResult'):
         err = result.err
         if "message" in err:
-            logger.terror("cluster.error.socketio", type=type, id=self.id, err=err["message"])
+            logger.terror("cluster.error.socketio", type=type, cluster=self.id, err=err["message"])
         else:
-            logger.terror("cluster.error.socketio", type=type, id=self.id, err=err)
+            logger.terror("cluster.error.socketio", type=type, cluster=self.id, err=err)
 
 class ClusterSocketIO:
     def __init__(self, cluster: Cluster) -> None:
@@ -788,7 +792,7 @@ async def init():
         )
         if not cluster.id:
             continue
-        logger.tsuccess("cluster.success.load_cluster", id=cluster.id)
+        logger.tsuccess("cluster.success.load_cluster", cluster=cluster.id)
         clusters.add_cluster(cluster)
     if len(clusters.clusters) == 0:
         logger.terror("cluster.error.no_cluster")

i18n/zh_cn.json

@@ -2,7 +2,7 @@
     "main.debug.service_unfinish": "在等待服务完成时出错。",
     "main.success.start_service_done": "服务启动成功。耗时：${time} 秒。",
     "main.success.service_exit": "已成功退出服务。",
-    "cluster.success.load_cluster": "已成功加载节点 [${id}]。",
+    "cluster.success.load_cluster": "已成功加载节点 [${cluster}]。",
     "cluster.debug.base_url": "使用的地址是 [${base_url}]",
     "cluster.success.fetch_filelist": "已成功获取文件列表，数量 [${total}] 大小 [${size}]",
     "cluster.debug.fetch_token": "正在获取 Token (${cluster})",
@@ -21,7 +21,7 @@
     "web.debug.request_info": "${host} | ${time} | ${address} | ${method} ${status} | ${real_path} - ${user_agent}",
     "cluster.error.socketio.request_cert": "节点 [${cluster}] 请求证书失败，原因 [${err}]",
     "cluster.debug.public_host": "已在 [${host}:${port}] 上开放",
-    "cluster.error.socketio": "节点 [${id}] 发送 [${type}] 时出错，原因 [${err}]",
+    "cluster.error.socketio": "节点 [${cluster}] 发送 [${type}] 时出错，原因 [${err}]",
     "cluster.info.socketio.message": "节点 [${cluster}] 主控消息：${message}",
     "storage.error.alist": "Alist 返回出错，错误代码 [${status}]，原因 [${message}]",
     "storage.error.alist.fetch_token": "Alist 获取 Token 出错，错误代码 [${status}]，原因 [${message}]",
@@ -30,6 +30,6 @@
     "cluster.debug.socketio.connected": "SocketIO 已连接",
     "cluster.success.cluster.disable": "节点 [${cluster}] 已正常下线",
     "cluster.info.want_enable": "节点 [${cluster}] 正在启用中……",
-    "cluster.info.cluster.retry_enable": "节点 [${id}] 将在 [${delay}] 后重新启用",
+    "cluster.info.cluster.retry_enable": "节点 [${cluster}] 将在 [${delay}] 后重新启用",
     "cluster.success.enabled": "节点 [${cluster}] 已正常上线"
 }