Update vps_monitor.py

vps_monitor.py

@@ -6,15 +6,14 @@ import sys
 from flask import Flask, jsonify, render_template_string
 from threading import Thread
 import logging
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 app = Flask(__name__)
 
 vps_status = {}
 
-# 设置日志
 logging.basicConfig(
-    level=logging.DEBUG,  # 将日志级别改为 DEBUG 以获取更多信息
+    level=logging.INFO,
     format='%(asctime)s - %(levelname)s - %(message)s',
     handlers=[
         logging.StreamHandler(sys.stdout),
@@ -44,41 +43,30 @@ def get_vps_configs():
             script_index += 1
         
         for script_path in script_paths:
-            config = {
+            configs.append({
                 'index': index,
                 'hostname': hostname,
                 'username': username,
                 'password': password,
                 'script_path': script_path
-            }
-            configs.append(config)
+            })
         
         index += 1
     return configs
 
 def parse_runtime(etime):
-    logger.debug(f"Parsing runtime: {etime}")
     parts = etime.split('-')
-    if len(parts) > 1:
-        days = int(parts[0])
-        time_parts = parts[1].split(':')
-    else:
-        days = 0
-        time_parts = parts[0].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 = map(int, time_parts)
-        seconds = 0
+        hours, minutes, seconds = int(time_parts[0]), int(time_parts[1]), 0
     else:
-        logger.warning(f"Unexpected time format: {etime}")
         return "0:00:00"
     
-    total_seconds = days * 86400 + hours * 3600 + minutes * 60 + seconds
-    runtime = str(timedelta(seconds=total_seconds))
-    logger.debug(f"Parsed runtime: {runtime}")
-    return runtime
+    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']}")
@@ -86,57 +74,34 @@ def check_and_run_script(config):
     try:
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        
-        client.connect(
-            hostname=config['hostname'],
-            username=config['username'],
-            password=config['password'],
-            port=22
-        )
+        client.connect(hostname=config['hostname'], username=config['username'], password=config['password'], port=22)
         
         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 -p {last_pid} -o pid=,etime=,args=" if last_pid else f"ps aux | grep '{script_path}' | grep -v grep"
         
         stdin, stdout, stderr = client.exec_command(check_command)
         output = stdout.read().decode('utf-8').strip()
-        logger.debug(f"Raw output from ps command: {output}")
         
         if output and (last_pid or script_path in output):
             parts = output.split()
             if last_pid:
-                pid = last_pid
-                runtime = parse_runtime(parts[1]) if len(parts) > 1 else "0:00:00"
+                pid, runtime = last_pid, parse_runtime(parts[1]) if len(parts) > 1 else "0:00:00"
             else:
-                pid = parts[1] if len(parts) > 1 else "Unknown"
-                runtime = parse_runtime(parts[9]) if len(parts) > 9 else "0:00:00"
+                pid, runtime = parts[1] if len(parts) > 1 else "Unknown", parse_runtime(parts[9]) if len(parts) > 9 else "0:00:00"
             status = "Running"
-            logger.info(f"Script {script_name} is running. PID: {pid}, Runtime: {runtime}")
         else:
             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)
+            stdin, stdout, stderr = client.exec_command(f"nohup /bin/sh {script_path} > /dev/null 2>&1 & echo $!")
             new_pid = stdout.read().decode('utf-8').strip()
             
             if new_pid.isdigit():
-                pid = new_pid
-                runtime = "0:00:00"
-                status = "Restarted"
-                logger.info(f"Script {script_name} restarted. New PID: {pid}")
+                pid, runtime, status = new_pid, "0:00:00", "Restarted"
             else:
-                pid = "N/A"
-                runtime = "N/A"
-                status = "Restart Failed"
-                logger.error(f"Failed to restart script {script_name}")
+                pid, runtime, status = "N/A", "N/A", "Restart Failed"
         
         vps_status[key] = {
             'index': config['index'],
@@ -150,8 +115,7 @@ def check_and_run_script(config):
         
     except Exception as e:
         logger.error(f"Error occurred while checking VPS {config['index']} - {config['hostname']} - {script_name}: {str(e)}")
-        key = f"{config['hostname']}:{script_name}"
-        vps_status[key] = {
+        vps_status[f"{config['hostname']}:{script_name}"] = {
             'index': config['index'],
             'status': f"Error: {str(e)}",
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -166,27 +130,18 @@ def check_and_run_script(config):
 
 def check_all_vps():
     logger.info("Starting VPS check")
-    vps_configs = get_vps_configs()
-    for config in vps_configs:
+    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"
     
-    # 添加每个VPS的状态
     for key, status in vps_status.items():
         hostname, script_name = key.split(':')
         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'],
-            status['pid'][:5]
+            status['index'], hostname[:21], script_name[:16], status['status'][:8],
+            status['last_check'], status['username'][:8], status['runtime'], status['pid'][:5]
         )
         table += "+---------+-----------------------+------------------+----------+-------------------------+----------+----------+-------+\n"
     
@@ -225,10 +180,7 @@ def index():
 
 @app.route('/status/<path:key>')
 def vps_status_detail(key):
-    if key in vps_status:
-        return jsonify(vps_status[key])
-    else:
-        return jsonify({"error": "VPS or script not found"}), 404
+    return jsonify(vps_status[key]) if key in vps_status else (jsonify({"error": "VPS or script not found"}), 404)
 
 @app.route('/health')
 def health_check():
@@ -243,13 +195,10 @@ def main():
     
     logger.info("===== VPS monitoring script is starting =====")
     
-    flask_thread = Thread(target=run_flask)
-    flask_thread.start()
+    Thread(target=run_flask).start()
     logger.info("Flask server started in background")
 
-    logger.info("Running initial VPS check")
     check_all_vps()
-
     schedule.every(15).minutes.do(check_all_vps)
     logger.info("Scheduled VPS check every 15 minutes")
     
@@ -260,7 +209,7 @@ def main():
         schedule.run_pending()
         time.sleep(60)
         heartbeat_count += 1
-        if heartbeat_count % 5 == 0:  # 每5分钟输出一次心跳信息
+        if heartbeat_count % 5 == 0:
             logger.info(f"Heartbeat: Script is still running. Uptime: {heartbeat_count} minutes")
 
 if __name__ == "__main__":