Update server10v.py

server10v.py

@@ -108,6 +108,8 @@ from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 import logging
 from datetime import datetime
+import psutil
+from typing import List, Dict
 import pytz
 
 # 创建 FRP 文件夹并下载 frpc 可执行文件。
@@ -183,6 +185,7 @@ def compress_folder():
             try:
                 # 执行压缩
                 result = subprocess.run(
+                    # tar -cvf - /data/SillyTavern | pigz -p 2 -1 > /dev/shm/a/sillytavern.tar.gz 2> /dev/null
                     f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path} 2> /dev/null',
                     shell=True,
                     check=True,
@@ -247,6 +250,91 @@ def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500,
     session.mount('https://', adapter)
     return session
 
+def kill_processes_on_port(port: int = 8000) -> Dict[str, List[int]]:
+    """
+    结束指定端口的所有相关进程
+    
+    Args:
+        port (int): 要处理的端口号，默认为8000
+    
+    Returns:
+        Dict[str, List[int]]: 结束的进程信息
+    """
+    killed_processes = {
+        'success': [],
+        'failed': []
+    }
+
+    try:
+        # 遍历所有进程
+        for proc in psutil.process_iter(['pid', 'name', 'cmdline']):
+            try:
+                # 检查进程的连接
+                connections = proc.net_connections()
+                
+                # 检查是否有指定端口的连接
+                port_matches = [
+                    conn for conn in connections 
+                    if conn.laddr.port == port
+                ]
+
+                if port_matches:
+                    pid = proc.pid
+                    name = proc.name()
+
+                    print(f"找到端口 {port} 相关进程: PID {pid}, 名称 {name}")
+                    
+                    try:
+                        # 尝试优雅地终止进程
+                        parent = psutil.Process(pid)
+                        
+                        # 终止进程及其所有子进程
+                        for child_proc in parent.children(recursive=True):
+                            try:
+                                child_proc.terminate()
+                                print(f"终止子进程: PID {child_proc.pid}")
+                            except Exception as child_err:
+                                print(f"无法终止子进程 {child_proc.pid}: {child_err}")
+                        
+                        parent.terminate()
+                        
+                        # 等待进程结束
+                        gone, alive = psutil.wait_procs([parent], timeout=3)
+                        
+                        for p in alive:
+                            print(f"强制杀死进程: PID {p.pid}")
+                            p.kill()
+                        
+                        killed_processes['success'].append(pid)
+                        print(f"成功终止进程 {pid}")
+
+                    except psutil.NoSuchProcess:
+                        print(f"进程 {pid} 已不存在")
+                    except psutil.AccessDenied:
+                        print(f"没有权限终止进程 {pid}")
+                        killed_processes['failed'].append(pid)
+                    except Exception as e:
+                        print(f"终止进程 {pid} 时发生错误: {e}")
+                        killed_processes['failed'].append(pid)
+
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                continue
+
+    except Exception as e:
+        print(f"搜索进程时发生错误: {e}")
+
+    # 打印总结报告
+    print("--- 进程终止报告 ---")
+    print(f"成功终止进程数: {len(killed_processes['success'])}")
+    print(f"终止失败进程数: {len(killed_processes['failed'])}")
+    
+    if killed_processes['success']:
+        print(f"成功终止的进程 PID: {killed_processes['success']}")
+    
+    if killed_processes['failed']:
+        print(f"终止失败的进程 PID: {killed_processes['failed']}")
+
+    return killed_processes
 
 
 def check_api1():
@@ -306,29 +394,13 @@ def monitor_port():
             config.read('/data/config.ini')
             monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
             if monitor_port_enabled:
+                kill_processes_on_port()
                 backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
                 backup_thread.start()
             else:
                 print(f"monitor_port_enabled 为False跳过")
-
-        
-        # with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        #     result = sock.connect_ex(('localhost', 8000))
-        #     if result == 0:
-        #         print(f"端口 8000 正在使用中")
-        #     else:
-        #         print(f"端口 8000 未被使用")
-        #         # 读取 config.ini 中的 monitor_port_enabled 配置项
-        #         config = configparser.ConfigParser()
-        #         config.read('/data/config.ini')
-        #         monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
-        #         if monitor_port_enabled:
-        #             backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
-        #             backup_thread.start()
-        #         else:
-        #             print(f"monitor_port_enabled 为False跳过")
         
-        time.sleep(5)  # 每5秒检查一次
+        time.sleep(15)  # 每5秒检查一次
 def Run_SillyTavern():
     try:
         os.chdir('/data/SillyTavern')
@@ -350,8 +422,6 @@ def Run_SillyTavern():
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
     # 创建目录并写入 kaggle.json
-
-
     # 打印当前工作目录和用户主目录
     print("Current Working Directory:", os.getcwd())
     print("Home Directory:", os.path.expanduser('~'))