Update vps_monitor.py

vps_monitor.py

@@ -6,7 +6,6 @@ import sys
 from flask import Flask, jsonify, render_template_string
 from threading import Thread
 import logging
-from datetime import timedelta
 
 app = Flask(__name__)
 
@@ -54,20 +53,6 @@ def get_vps_configs():
         index += 1
     return configs
 
-def parse_runtime(etime):
-    parts = etime.split('-')
-    days = int(parts[0]) if len(parts) > 1 else 0
-    time_parts = parts[-1].split(':')
-    
-    if len(time_parts) == 3:
-        hours, minutes, seconds = map(int, time_parts)
-    elif len(time_parts) == 2:
-        hours, minutes, seconds = int(time_parts[0]), int(time_parts[1]), 0
-    else:
-        return "0:00:00"
-    
-    return str(timedelta(days=days, hours=hours, minutes=minutes, seconds=seconds))
-
 def check_and_run_script(config):
     logger.info(f"Checking VPS {config['index']}: {config['hostname']} - {config['script_path']}")
     client = None
@@ -80,18 +65,12 @@ def check_and_run_script(config):
         script_name = os.path.basename(script_path)
         key = f"{config['hostname']}:{script_name}"
         
-        last_pid = vps_status.get(key, {}).get('pid', None)
-        check_command = f"ps -p {last_pid} -o pid=,etime=,args=" if last_pid else f"ps aux | grep '{script_path}' | grep -v grep"
+        check_command = f"ps aux | grep '{script_path}' | grep -v grep"
         
         stdin, stdout, stderr = client.exec_command(check_command)
         output = stdout.read().decode('utf-8').strip()
         
-        if output and (last_pid or script_path in output):
-            parts = output.split()
-            if last_pid:
-                pid, runtime = last_pid, parse_runtime(parts[1]) if len(parts) > 1 else "0:00:00"
-            else:
-                pid, runtime = parts[1] if len(parts) > 1 else "Unknown", parse_runtime(parts[9]) if len(parts) > 9 else "0:00:00"
+        if output and script_path in output:
             status = "Running"
         else:
             logger.info(f"Script {script_name} not running. Attempting to restart.")
@@ -99,18 +78,16 @@ def check_and_run_script(config):
             new_pid = stdout.read().decode('utf-8').strip()
             
             if new_pid.isdigit():
-                pid, runtime, status = new_pid, "0:00:00", "Restarted"
+                status = "Restarted"
             else:
-                pid, runtime, status = "N/A", "N/A", "Restart Failed"
+                status = "Restart Failed"
         
         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,
-            'pid': pid
+            'script_name': script_name
         }
         
     except Exception as e:
@@ -120,9 +97,7 @@ 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,
-            'runtime': "N/A",
-            'pid': "N/A"
+            'script_name': script_name
         }
     finally:
         if client:
@@ -133,17 +108,17 @@ def check_all_vps():
     for config in get_vps_configs():
         check_and_run_script(config)
     
-    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
-    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username | Runtime  | PID   |\n"
-    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
+    table = "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
+    table += "| Index   | Hostname              | Script Name      | Status   | Last Check              | Username |\n"
+    table += "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
     
     for key, status in vps_status.items():
         hostname, script_name = key.split(':')
-        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} | {:<8} | {:<5} |\n".format(
+        table += "| {:<7} | {:<21} | {:<16} | {:<8} | {:<23} | {:<8} |\n".format(
             status['index'], hostname[:21], script_name[:16], status['status'][:8],
-            status['last_check'], status['username'][:8], status['runtime'], status['pid'][:5]
+            status['last_check'], status['username'][:8]
         )
-        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
+        table += "+---------+-----------------------+------------------+----------+-------------------------+----------+\n"
     
     logger.info("\n" + table)
 
@@ -159,8 +134,6 @@ def index():
             <th>Status</th>
             <th>Last Check</th>
             <th>Username</th>
-            <th>Runtime</th>
-            <th>PID</th>
         </tr>
         {% for key, data in vps_status.items() %}
         <tr>
@@ -170,8 +143,6 @@ def index():
             <td>{{ data.status }}</td>
             <td>{{ data.last_check }}</td>
             <td>{{ data.username }}</td>
-            <td>{{ data.runtime }}</td>
-            <td>{{ data.pid }}</td>
         </tr>
         {% endfor %}
     </table>