Update server.py
Browse files
server.py
CHANGED
|
@@ -462,20 +462,16 @@ def check_api1():
|
|
| 462 |
logging.info("检测到 token")
|
| 463 |
nn = 0
|
| 464 |
retry_count = 3 # 设置重试次数
|
| 465 |
-
|
| 466 |
-
|
| 467 |
-
print("SSH 连接成功")
|
| 468 |
-
subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
|
| 469 |
-
# break # 如果成功,跳出重试循环
|
| 470 |
-
else:
|
| 471 |
-
print("SSH 连接失败")
|
| 472 |
-
|
| 473 |
|
| 474 |
-
|
| 475 |
-
|
| 476 |
-
|
| 477 |
-
|
| 478 |
-
|
|
|
|
|
|
|
| 479 |
else:
|
| 480 |
logging.info("%s 接口返回信息: %s", url, response_json) # 修正日志记录
|
| 481 |
except requests.exceptions.ConnectionError as e:
|
|
|
|
| 462 |
logging.info("检测到 token")
|
| 463 |
nn = 0
|
| 464 |
retry_count = 3 # 设置重试次数
|
| 465 |
+
for attempt in range(retry_count):
|
| 466 |
+
try:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 467 |
|
| 468 |
+
subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no -o ConnectTimeout=30' --timeout=300 root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
|
| 469 |
+
break # 如果成功,跳出重试循环
|
| 470 |
+
except subprocess.CalledProcessError as e:
|
| 471 |
+
logging.error(f"Rsync 失败,返回码: {e.returncode}, 尝试次数: {attempt + 1}")
|
| 472 |
+
if attempt == retry_count - 1:
|
| 473 |
+
logging.error("所有重试均失败,停止尝试。")
|
| 474 |
+
generate_ssh_key() # 处理 SSH 密钥生成
|
| 475 |
else:
|
| 476 |
logging.info("%s 接口返回信息: %s", url, response_json) # 修正日志记录
|
| 477 |
except requests.exceptions.ConnectionError as e:
|