Update server.py

server.py

@@ -462,20 +462,20 @@ def check_api1():
                 logging.info("检测到 token")
                 nn = 0
                 retry_count = 3  # 设置重试次数
-                try:
-                    if check_ssh_connection(ssh_url, ssh_port, 'root', 'qilan'):
-                        print("SSH 连接成功")
-                        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)
-                        break  # 如果成功，跳出重试循环
-                    else:
-                        print("SSH 连接失败")
+                # try:
+                if check_ssh_connection(ssh_url, ssh_port, 'root', 'qilan'):
+                    print("SSH 连接成功")
+                    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)
+                    # break  # 如果成功，跳出重试循环
+                else:
+                    print("SSH 连接失败")
                         
                         
-                except subprocess.CalledProcessError as e:
-                    logging.error(f"Rsync 失败，返回码: {e.returncode}, 尝试次数: {attempt + 1}")
-                    if attempt == retry_count - 1:
-                        logging.error("所有重试均失败，停止尝试。")
-                        generate_ssh_key()  # 处理 SSH 密钥生成
+                # except subprocess.CalledProcessError as e:
+                #     logging.error(f"Rsync 失败，返回码: {e.returncode}, 尝试次数: {attempt + 1}")
+                #     if attempt == retry_count - 1:
+                #         logging.error("所有重试均失败，停止尝试。")
+                #         generate_ssh_key()  # 处理 SSH 密钥生成
             else:
                 logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
         except requests.exceptions.ConnectionError as e:
@@ -683,6 +683,7 @@ def SillyTavern():
 
         
         os.chdir(data_folder)
+        os.system('git pull --rebase --autostash')
         os.system(f"ls {data_folder}")
         os.system("nvm install node")
         os.system("nvm use node")
@@ -694,7 +695,7 @@ def SillyTavern():
             print("Output:", e.output)
         os.system(f"ls {data_folder}")
         print('更新文件')
-        os.system('git pull --rebase --autostash')
+        
         backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
         backup_thread.start()
         # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)