Update server2.py

server2.py

@@ -92,6 +92,10 @@ from requests.packages.urllib3.util.retry import Retry
 os.system("rm -r /sync.sh")
 os.system("wget -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh")
 os.system("export LC_ALL=zh_CN.UTF-8")
+# 创建 FRP 文件夹并下载 frpc 可执行文件。
+os.system("mkdir -p /content/frp")
+os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
+os.system("chmod +x /content/frp/frpc")
 # 更新软件包列表
 def is_installed(package):
     """Check if a package is installed."""
@@ -433,7 +437,7 @@ def check_api1():
                 try:
                     # rsync -avz --port=7073 ljj@8.137.94.137::qilan /a/
                     # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
-                    subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+                    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=300)
                 except subprocess.CalledProcessError as e:
                     print(f"Rsync 失败，返回码: {e.returncode}")
                     print(f"Command output: {e.output}")
@@ -463,10 +467,6 @@ def check_api1():
 
 def frp(configs, backstage):
      print('-----------FRP开始-------------')
-     # 创建 FRP 文件夹并下载 frpc 可执行文件。
-     os.system("mkdir -p /content/frp")
-     os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
-     os.system("chmod +x /content/frp/frpc")
      # 遍历所有配置并启动 FRP。
      for config_data, config_file_path in configs:
          with open(config_file_path, 'w') as config_file:
@@ -616,7 +616,7 @@ def SillyTavern():
         generate_ssh_key()
         copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
         # subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
-        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+        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=300)
         # sys.exit()
     else: