Qilan2 commited on
Commit
7a7dc00
·
verified ·
1 Parent(s): 156e66e

Update server2.py

Browse files
Files changed (1) hide show
  1. server2.py +2 -3
server2.py CHANGED
@@ -453,8 +453,7 @@ def check_api1():
453
  for attempt in range(retry_count):
454
  try:
455
 
456
- subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",
457
- shell=True, check=True, timeout=300)
458
  break # 如果成功,跳出重试循环
459
  except subprocess.CalledProcessError as e:
460
  logging.error(f"Rsync 失败,返回码: {e.returncode}, 尝试次数: {attempt + 1}")
@@ -649,7 +648,7 @@ def SillyTavern():
649
  generate_ssh_key()
650
  copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
651
  # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
652
- subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True, timeout=600)
653
  # sys.exit()
654
  else:
655
 
 
453
  for attempt in range(retry_count):
454
  try:
455
 
456
+ 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)
 
457
  break # 如果成功,跳出重试循环
458
  except subprocess.CalledProcessError as e:
459
  logging.error(f"Rsync 失败,返回码: {e.returncode}, 尝试次数: {attempt + 1}")
 
648
  generate_ssh_key()
649
  copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
650
  # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
651
+ 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)
652
  # sys.exit()
653
  else:
654