Update vps_monitor.py

vps_monitor.py

@@ -23,9 +23,6 @@ logging.basicConfig(
 )
 logger = logging.getLogger()
 
-# 记录脚本启动时间
-script_start_time = datetime.now()
-
 def get_vps_configs():
     configs = []
     index = 1
@@ -82,7 +79,7 @@ def check_and_run_script(config):
         
         # 检查进程是否在运行
         if last_pid:
-            check_command = f"ps -p {last_pid} -o pid,etime,args"
+            check_command = f"ps -p {last_pid} -o pid=,etime=,args="
         else:
             check_command = f"ps aux | grep '{script_path}' | grep -v grep"
         
@@ -107,7 +104,7 @@ def check_and_run_script(config):
             
             if new_pid.isdigit():
                 pid = new_pid
-                runtime = "Just started"
+                runtime = "00:00"
                 status = "Restarted"
                 logger.info(f"Script {script_name} restarted. New PID: {pid}")
             else:
@@ -119,7 +116,7 @@ def check_and_run_script(config):
         vps_status[key] = {
             'index': config['index'],
             'status': status,
-            'last_check': (datetime.now() - script_start_time).total_seconds(),
+            'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
             'script_name': script_name,
             'runtime': runtime,
@@ -132,7 +129,7 @@ def check_and_run_script(config):
         vps_status[key] = {
             'index': config['index'],
             'status': f"Error: {str(e)}",
-            'last_check': (datetime.now() - script_start_time).total_seconds(),
+            'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username'],
             'script_name': script_name,
             'runtime': "N/A",
@@ -156,15 +153,14 @@ def check_all_vps():
     # 添加每个VPS的状态
     for key, status in vps_status.items():
         hostname, script_name = key.split(':')
-        last_check = timedelta(seconds=int(status['last_check']))
         table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} | {:<8} | {:<5} |\n".format(
             status['index'],
             hostname[:21],
             script_name[:16],
             status['status'][:8],
-            str(last_check),
+            status['last_check'],
             status['username'][:8],
-            status['runtime'][:8],
+            status['runtime'],
             status['pid'][:5]
         )
         table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
@@ -192,7 +188,7 @@ def index():
             <td><a href="/status/{{ key }}">{{ key.split(':')[0] }}</a></td>
             <td>{{ data.script_name }}</td>
             <td>{{ data.status }}</td>
-            <td>{{ timedelta(seconds=data.last_check|int) }}</td>
+            <td>{{ data.last_check }}</td>
             <td>{{ data.username }}</td>
             <td>{{ data.runtime }}</td>
             <td>{{ data.pid }}</td>
@@ -200,7 +196,7 @@ def index():
         {% endfor %}
     </table>
     '''
-    return render_template_string(html, vps_status=vps_status, timedelta=timedelta)
+    return render_template_string(html, vps_status=vps_status)
 
 @app.route('/status/<path:key>')
 def vps_status_detail(key):
@@ -211,12 +207,15 @@ def vps_status_detail(key):
 
 @app.route('/health')
 def health_check():
-    return jsonify({"status": "healthy", "uptime": (datetime.now() - script_start_time).total_seconds()}), 200
+    return jsonify({"status": "healthy", "uptime": time.time() - start_time}), 200
 
 def run_flask():
     app.run(host='0.0.0.0', port=8080)
 
 def main():
+    global start_time
+    start_time = time.time()
+    
     logger.info("===== VPS monitoring script is starting =====")
     
     flask_thread = Thread(target=run_flask)
@@ -237,8 +236,7 @@ def main():
         time.sleep(60)
         heartbeat_count += 1
         if heartbeat_count % 5 == 0:  # 每5分钟输出一次心跳信息
-            uptime = datetime.now() - script_start_time
-            logger.info(f"Heartbeat: Script is still running. Uptime: {uptime}")
+            logger.info(f"Heartbeat: Script is still running. Uptime: {heartbeat_count} minutes")
 
 if __name__ == "__main__":
     main()