Update vps_monitor.py

vps_monitor.py

@@ -6,6 +6,7 @@ import sys
 from flask import Flask, jsonify, render_template_string
 from threading import Thread
 import logging
+from datetime import datetime, timedelta
 
 app = Flask(__name__)
 
@@ -72,10 +73,18 @@ def check_and_run_script(config):
         script_path = config['script_path']
         script_name = os.path.basename(script_path)
         
-        check_command = f"ps aux | grep {script_name} | 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)
-        if stdout.read():
+        output = stdout.read().decode('utf-8').strip()
+        
+        if output:
             status = "Running"
+            # 解析运行时间
+            parts = output.split()
+            if len(parts) > 1:
+                runtime = parts[1]
+            else:
+                runtime = "Unknown"
         else:
             restart_command = f"/bin/sh {script_path}"
             stdin, stdout, stderr = client.exec_command(restart_command)
@@ -83,9 +92,11 @@ def check_and_run_script(config):
             
             if exit_status == 0:
                 status = "Restarted"
+                runtime = "Just started"
             else:
                 error_output = stderr.read().decode('utf-8')
                 status = f"Error: {error_output}"
+                runtime = "N/A"
         
         key = f"{config['hostname']}:{script_name}"
         vps_status[key] = {
@@ -93,7 +104,8 @@ def check_and_run_script(config):
             'status': status,
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
-            'script_name': script_name
+            'script_name': script_name,
+            'runtime': runtime
         }
         
     except Exception as e:
@@ -104,7 +116,8 @@ def check_and_run_script(config):
             'status': f"Error: {str(e)}",
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
-            'script_name': script_name
+            'script_name': script_name,
+            'runtime': "N/A"
         }
     finally:
         if client:
@@ -117,22 +130,23 @@ def check_all_vps():
         check_and_run_script(config)
     
     # 创建表格头
-    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
-    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username |\n"
-    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
+    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
+    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username | Runtime  |\n"
+    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
     
     # 添加每个VPS的状态
     for key, status in vps_status.items():
         hostname, script_name = key.split(':')
-        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} |\n".format(
+        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} | {:<8} |\n".format(
             status['index'],
             hostname[:21],
             script_name[:16],
             status['status'][:8],
             status['last_check'],
-            status['username'][:8]
+            status['username'][:8],
+            status['runtime'][:8]
         )
-        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
+        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+\n"
     
     logger.info("\n" + table)
 
@@ -148,6 +162,7 @@ def index():
             <th>Status</th>
             <th>Last Check</th>
             <th>Username</th>
+            <th>Runtime</th>
         </tr>
         {% for key, data in vps_status.items() %}
         <tr>
@@ -157,6 +172,7 @@ def index():
             <td>{{ data.status }}</td>
             <td>{{ data.last_check }}</td>
             <td>{{ data.username }}</td>
+            <td>{{ data.runtime }}</td>
         </tr>
         {% endfor %}
     </table>