Update server.py

server.py

@@ -203,11 +203,16 @@ def compress_folder():
         #result = subprocess.run(['7z', 'a', '-tzip', '-mx=1','-mmt=2', zip_file_path, data_folder])
         # 7z a -tzip -mx=1 -mmt=2 /a/sillytavern.zip /sillytavern/*
         # tar -cvf - /sillytavern | pigz -p 6 -1 > /a/sillytavern.tar.gz
-        result = subprocess.run(
-        f'tar -cvf - {data_folder} | pigz -p 6 -1 > {zip_file_path}',
-        shell=True,
-        check=True
-        )
+        try:
+            result = subprocess.run(
+            f'tar -cvf - {data_folder} | pigz -p 6 -1 > {zip_file_path} 2> /dev/null',
+            shell=True,
+            check=True,
+            stdout=subprocess.DEVNULL,  # 将标准输出重定向到 /dev/null
+            stderr=subprocess.DEVNULL   # 将标准错误也重定向到 /dev/null
+            )
+        except subprocess.CalledProcessError as e:
+            print(f"Command failed with return code {e.returncode}")
 
         print('重命名压缩后的文件')
         file_path = "/a/sillytavern.ctk"
@@ -347,6 +352,7 @@ def check_api1():
     Service_status = False
     # 第二次检查接口状态
     n = 0
+    nn = 0
     while True:
         n = n + 1
         if not os.path.exists(data_folder):#
@@ -364,6 +370,7 @@ def check_api1():
             print(url,"接口返回信息：", response_json)
             if "token" in response_json:
                 print("检测到 token")
+                nn = 0
                 try:
                     subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
                 except subprocess.CalledProcessError as e:
@@ -377,7 +384,9 @@ def check_api1():
         except requests.exceptions.ConnectionError as e:
             print(f"接口异常1",n)
             # threading.Thread(target=Frpc, daemon=True).start()
-            break
+            nn = nn + 1
+            if nn == 10:
+                break
         
         except requests.exceptions.Timeout as e:
             print(f"接口异常2",n)
@@ -548,6 +557,7 @@ def SillyTavern():
         os.system(f"7z x /{huggingface_Data_name}.zip -o/ -y")
         # os.system("mv /sillytavern.zip1 /sillytavern.zip")
         # os.system("7z x /sillytavern.zip -o/sillytavern -y")
+        os.system("mv /sillytavern.tck sillytavern.tar.gz")
         os.system("mv /sillytavern.ctk sillytavern.tar.gz")
         # os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
         os.system(f"tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")