Qilan2 commited on
Commit
8f1f9e9
·
verified ·
1 Parent(s): df75d0c

Update server.py

Browse files
Files changed (1) hide show
  1. server.py +12 -13
server.py CHANGED
@@ -462,21 +462,20 @@ def check_api1():
462
  logging.info("检测到 token")
463
  nn = 0
464
  retry_count = 3 # 设置重试次数
465
- for attempt in range(retry_count):
466
- try:
467
- if check_ssh_connection(ssh_url, ssh_port, 'root', 'qilan'):
468
- print("SSH 连接成功")
469
- 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)
470
- break # 如果成功,跳出重试循环
471
- else:
472
- print("SSH 连接失败")
473
 
474
 
475
- except subprocess.CalledProcessError as e:
476
- logging.error(f"Rsync 失败,返回码: {e.returncode}, 尝试次数: {attempt + 1}")
477
- if attempt == retry_count - 1:
478
- logging.error("所有重试均失败,停止尝试。")
479
- generate_ssh_key() # 处理 SSH 密钥生成
480
  else:
481
  logging.info("%s 接口返回信息: %s", url, response_json) # 修正日志记录
482
  except requests.exceptions.ConnectionError as e:
 
462
  logging.info("检测到 token")
463
  nn = 0
464
  retry_count = 3 # 设置重试次数
465
+ try:
466
+ if check_ssh_connection(ssh_url, ssh_port, 'root', 'qilan'):
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
+ except subprocess.CalledProcessError as e:
475
+ logging.error(f"Rsync 失败,返回码: {e.returncode}, 尝试次数: {attempt + 1}")
476
+ if attempt == retry_count - 1:
477
+ logging.error("所有重试均失败,停止尝试。")
478
+ generate_ssh_key() # 处理 SSH 密钥生成
479
  else:
480
  logging.info("%s 接口返回信息: %s", url, response_json) # 修正日志记录
481
  except requests.exceptions.ConnectionError as e: