Update server.py

server.py

@@ -357,7 +357,7 @@ def copy_public_key_to_remote(host, port, user, password):
 generate_ssh_key()
 os.system('chmod 600 ~/.ssh/id_rsa')
 # # 复制公钥到远程服务器
-copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
  
 def write_rsyncd_conf(path, port=7071):
     rsyncd_conf_content = f"""
@@ -385,96 +385,91 @@ def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500,
     session.mount('https://', adapter)
     return session
 
+import os
+import time
+import requests
+import subprocess
+import logging
+
+# 配置日志
+logging.basicConfig(level=logging.INFO)
+
 def check_api1():
     # 第一次检查 SillyTavern 是否启动
-    thread_started = False  # 在函数内初始化标志变量
-    n=0
+    thread_started = False
+    n = 0
     while True:
-        n = n + 1
+        n += 1
         if not os.path.exists(data_folder):
-            print(f"/sillytavern/ 文件不存在，结束检测")
+            logging.error(f"/sillytavern/ 文件不存在，结束检测")
             break
         try:
             url = "http://127.0.0.1:8000/v1"
             response = requests.get(url, timeout=30)
 
-            # 检查响应状态码
             if response.status_code == 403:
-                print("SillyTavern已经启动")
-                threading.Thread(target=Oneapi, daemon=True).start()
-                break  # 接口正常，退出循环
+                logging.info("SillyTavern已经启动")
+                break
             
-            # 如果不是 403，打印其他信息
-            print("SillyTavern未启动，状态码:", response.status_code,n)
+            logging.info("SillyTavern未启动，状态码:", response.status_code, n)
 
         except requests.exceptions.RequestException as e:
-            print(f"SillyTavern未启动3",n)  # 打印具体错误信息
+            logging.error(f"SillyTavern未启动3: {e}, 尝试次数: {n}")
         
-        time.sleep(5)  # 等待5秒后重试
+        time.sleep(5)
     
-    print('开始检测接口状态')
+    logging.info('开始检测接口状态')
     Service_status = False
-    # 第二次检查接口状态
     n = 0
     nn = 0
     while True:
-        n = n + 1
-        if not os.path.exists(data_folder):#
-            print(f"/sillytavern/ 文件不存在，结束检测")
+        n += 1
+        if not os.path.exists(data_folder):
+            logging.error(f"/sillytavern/ 文件不存在，结束检测")
             break
         if Service_status:
-            print("结束检测")
+            logging.info("结束检测")
             break
-        url = f"{st_url}/csrf-token"  # 确保这个 URL 是正确的   
+        url = f"{st_url}/csrf-token"
         try:
             response = requests_retry_session().get(url, timeout=30)
-            response.raise_for_status()  # 检查响应状态
-            # 尝试解析 JSON 响应
-            response_json = response.json()  # 获取 JSON 内容
-            print(url,"接口返回信息：", response_json)
+            response.raise_for_status()
+            response_json = response.json()
+            logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
             if "token" in response_json:
-                print("检测到 token")
+                logging.info("检测到 token")
                 nn = 0
-                try:
-                    # subprocess.run(f"rsync -avz --port=7071 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)
-                except subprocess.CalledProcessError as e:
-                    print(f"Rsync 失败，返回码: {e.returncode}")
-                    print(f"Command output: {e.output}")
-                    generate_ssh_key()
-                # subprocess.run(f"bash /sync.sh -p {ssh_port} -s {frp_url}", shell=True, check=True)
-                # break  # 跳出循环
+                retry_count = 3  # 设置重试次数
+                for attempt in range(retry_count):
+                    try:
+                        
+                        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)
+                        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 密钥生成
             else:
-                print("接口返回信息：", response_json)
+                logging.info("%s 接口返回信息： %s", url, response_json)  # 修正日志记录
         except requests.exceptions.ConnectionError as e:
-            print(f"接口异常1",n)
-            # threading.Thread(target=Frpc, daemon=True).start()
-            nn = nn + 1
-            if nn == 5:
+            logging.error(f"接口异常1: {e}, 尝试次数: {n}, nn: {nn}")
+            nn += 1
+            if nn > 10:
                 break
-        
         except requests.exceptions.Timeout as e:
-            print(f"接口异常2",n)
-            # threading.Thread(target=Frpc, daemon=True).start()
+            logging.error(f"接口异常2: {e}, 尝试次数: {n}")
             break
-            
         except requests.exceptions.RequestException as e:
-           print(f"接口异常3:",n)
-           # threading.Thread(target=Frpc, daemon=True).start()
-           break
+            logging.error(f"接口异常3: {e}, 尝试次数: {n}")
+            break
         
-        time.sleep(2)  # 等待5秒后重试
+        time.sleep(5)
 
 
 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:
@@ -640,7 +635,7 @@ def SillyTavern():
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
         generate_ssh_key()
-        copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+        copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
         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 --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
         # sys.exit()