Update server.py

server.py

@@ -430,61 +430,58 @@ def check_api1():
             response = requests.get(url, timeout=30)
 
             if response.status_code == 403:
-                logging.info("SillyTavern已经启动")
+                print("SillyTavern已经启动")
                 break
             
-            logging.info("SillyTavern未启动，状态码:", response.status_code, n)
+            print("SillyTavern未启动，状态码:", response.status_code, n)
 
         except requests.exceptions.RequestException as e:
-            logging.error(f"SillyTavern未启动3: {e}, 尝试次数: {n}")
+            print(f"SillyTavern未启动3: {e}, 尝试次数: {n}")
         
         time.sleep(5)
     
-    logging.info('开始检测接口状态')
+    print('ST本地已经运行，开始检测接口状态')
     Service_status = False
     n = 0
     nn = 0
     while True:
         n += 1
         if not os.path.exists(data_folder):
-            logging.error(f"/sillytavern/ 文件不存在，结束检测")
+            print(f"/sillytavern/ 文件不存在，结束检测")
             break
         if Service_status:
-            logging.info("结束检测")
+            print("结束检测")
+            break
+        if nn > 2:
             break
         url = f"{st_url}/csrf-token"
         try:
             response = requests_retry_session().get(url, timeout=30)
             response.raise_for_status()
             response_json = response.json()
-            logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
+            print("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
             if "token" in response_json:
-                logging.info("检测到 token")
-                nn = 0
-                retry_count = 3  # 设置重试次数
-                for attempt in range(retry_count):
-                    try:
-                        
-                        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)
-                        break  # 如果成功，跳出重试循环
-                    except subprocess.CalledProcessError as e:
-                        logging.error(f"Rsync 失败，返回码: {e.returncode}, 尝试次数: {attempt + 1}")
-                        if attempt == retry_count - 1:
-                            logging.error("所有重试均失败，停止尝试。")
-                            generate_ssh_key()  # 处理 SSH 密钥生成
+                print("检测到 token")
+                try:  
+                    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  # 如果成功，跳出重试循环
+                except subprocess.CalledProcessError as e:
+                    nn += 1
+                    print(f"Rsync 失败，返回码: {e.returncode}, 尝试次数: {nn}")
+                    generate_ssh_key()  # 处理 SSH 密钥生成
             else:
-                logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
+                print("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
         except requests.exceptions.ConnectionError as e:
-            logging.error(f"接口异常1: {e}, 尝试次数: {n}, nn: {nn}")
-            time.sleep(3)
+            print(f"接口异常1: {e}, 尝试次数: {n}, nn: {nn}")
+            # time.sleep(3)
             nn += 1
-            if nn > 10:
+            if nn > 5:
                 break
         except requests.exceptions.Timeout as e:
-            logging.error(f"接口异常2: {e}, 尝试次数: {n}")
+            print(f"接口异常2: {e}, 尝试次数: {n}")
             break
         except requests.exceptions.RequestException as e:
-            logging.error(f"接口异常3: {e}, 尝试次数: {n}")
+            print(f"接口异常3: {e}, 尝试次数: {n}")
             break
         
         time.sleep(5)