Update vps_monitor.py

vps_monitor.py

@@ -72,40 +72,55 @@ def check_and_run_script(config):
         
         script_path = config['script_path']
         script_name = os.path.basename(script_path)
+        key = f"{config['hostname']}:{script_name}"
+        
+        # 获取上次保存的 PID（如果有）
+        last_pid = vps_status.get(key, {}).get('pid', None)
+        
+        # 检查进程是否在运行
+        if last_pid:
+            check_command = f"ps -p {last_pid} -o pid,etime,args"
+        else:
+            check_command = f"ps aux | grep '{script_path}' | grep -v grep"
         
-        check_command = f"ps -eo pid,etime,args | grep {script_name} | grep -v grep"
         stdin, stdout, stderr = client.exec_command(check_command)
         output = stdout.read().decode('utf-8').strip()
         
-        if output:
-            status = "Running"
-            # 解析运行时间
+        if output and (last_pid or script_path in output):
             parts = output.split()
-            if len(parts) > 1:
-                runtime = parts[1]
+            if last_pid:
+                pid = last_pid
+                runtime = parts[1] if len(parts) > 1 else "Unknown"
             else:
-                runtime = "Unknown"
+                pid = parts[1] if len(parts) > 1 else "Unknown"
+                runtime = parts[9] if len(parts) > 9 else "Unknown"
+            status = "Running"
+            logger.info(f"Script {script_name} is running. PID: {pid}, Runtime: {runtime}")
         else:
-            restart_command = f"/bin/sh {script_path}"
+            logger.info(f"Script {script_name} not running. Attempting to restart.")
+            restart_command = f"nohup /bin/sh {script_path} > /dev/null 2>&1 & echo $!"
             stdin, stdout, stderr = client.exec_command(restart_command)
-            exit_status = stdout.channel.recv_exit_status()
+            new_pid = stdout.read().decode('utf-8').strip()
             
-            if exit_status == 0:
-                status = "Restarted"
+            if new_pid.isdigit():
+                pid = new_pid
                 runtime = "Just started"
+                status = "Restarted"
+                logger.info(f"Script {script_name} restarted. New PID: {pid}")
             else:
-                error_output = stderr.read().decode('utf-8')
-                status = f"Error: {error_output}"
+                pid = "N/A"
                 runtime = "N/A"
+                status = "Restart Failed"
+                logger.error(f"Failed to restart script {script_name}")
         
-        key = f"{config['hostname']}:{script_name}"
         vps_status[key] = {
             'index': config['index'],
             'status': status,
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
             'script_name': script_name,
-            'runtime': runtime
+            'runtime': runtime,
+            'pid': pid
         }
         
     except Exception as e:
@@ -117,7 +132,8 @@ def check_and_run_script(config):
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
             'script_name': script_name,
-            'runtime': "N/A"
+            'runtime': "N/A",
+            'pid': "N/A"
         }
     finally:
         if client:
@@ -130,23 +146,24 @@ def check_all_vps():
         check_and_run_script(config)
     
     # 创建表格头
-    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
-    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username | Runtime  |\n"
-    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
+    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
+    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username | Runtime  | PID   |\n"
+    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
     
     # 添加每个VPS的状态
     for key, status in vps_status.items():
         hostname, script_name = key.split(':')
-        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} | {:<8} |\n".format(
+        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} | {:<8} | {:<5} |\n".format(
             status['index'],
             hostname[:21],
             script_name[:16],
             status['status'][:8],
             status['last_check'],
             status['username'][:8],
-            status['runtime'][:8]
+            status['runtime'][:8],
+            status['pid'][:5]
         )
-        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
+        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
     
     logger.info("\n" + table)
 
@@ -163,6 +180,7 @@ def index():
             <th>Last Check</th>
             <th>Username</th>
             <th>Runtime</th>
+            <th>PID</th>
         </tr>
         {% for key, data in vps_status.items() %}
         <tr>
@@ -173,6 +191,7 @@ def index():
             <td>{{ data.last_check }}</td>
             <td>{{ data.username }}</td>
             <td>{{ data.runtime }}</td>
+            <td>{{ data.pid }}</td>
         </tr>
         {% endfor %}
     </table>