Update vps_monitor.py

vps_monitor.py

@@ -30,26 +30,39 @@ def get_vps_configs():
         if not hostname:
             break
         
-        config = {
-            'index': index,
-            'hostname': hostname,
-            'username': os.environ.get(f'USERNAME_{index}'),
-            'password': os.environ.get(f'PASSWORD_{index}'),
-            'script_path': os.environ.get(f'SCRIPT_PATH_{index}')
-        }
-        configs.append(config)
+        username = os.environ.get(f'USERNAME_{index}')
+        password = os.environ.get(f'PASSWORD_{index}')
+        
+        script_paths = []
+        script_index = 1
+        while True:
+            script_path = os.environ.get(f'SCRIPT_PATHS_{index}_{script_index}')
+            if not script_path:
+                break
+            script_paths.append(script_path.strip())
+            script_index += 1
+        
+        for script_path in script_paths:
+            config = {
+                'index': index,
+                'hostname': hostname,
+                'username': username,
+                'password': password,
+                'script_path': script_path
+            }
+            configs.append(config)
         
         # 添加调试输出
-        logger.info(f"Config {index}: {config}")
-        print(f"Config {index}: {config}")
+        logger.info(f"Config {index}: {hostname}, {username}, {script_paths}")
+        print(f"Config {index}: {hostname}, {username}, {script_paths}")
         sys.stdout.flush()
         
         index += 1
     return configs
 
 def check_and_run_script(config):
-    logger.info(f"Checking VPS {config['index']}: {config['hostname']}")
-    print(f"Checking VPS {config['index']}: {config['hostname']}")
+    logger.info(f"Checking VPS {config['index']}: {config['hostname']} - {config['script_path']}")
+    print(f"Checking VPS {config['index']}: {config['hostname']} - {config['script_path']}")
     sys.stdout.flush()
     client = None
     try:
@@ -72,42 +85,46 @@ def check_and_run_script(config):
         stdin, stdout, stderr = client.exec_command(check_command)
         if stdout.read():
             status = "Running"
-            logger.info(f"Script is running on {config['hostname']}")
+            logger.info(f"Script {script_name} is running on {config['hostname']}")
         else:
-            logger.info(f"Script not running on {config['hostname']}. Executing restart script.")
+            logger.info(f"Script {script_name} not running on {config['hostname']}. Executing restart script.")
             restart_command = f"/bin/sh {script_path}"  # 使用完整路径的sh
             stdin, stdout, stderr = client.exec_command(restart_command)
             exit_status = stdout.channel.recv_exit_status()
             
             if exit_status == 0:
                 status = "Restarted"
-                logger.info(f"Restart script executed successfully on {config['hostname']}")
+                logger.info(f"Restart script {script_name} executed successfully on {config['hostname']}")
             else:
                 error_output = stderr.read().decode('utf-8')
                 status = f"Error: {error_output}"
-                logger.error(f"Error executing restart script on {config['hostname']}: {error_output}")
+                logger.error(f"Error executing restart script {script_name} on {config['hostname']}: {error_output}")
         
-        vps_status[config['hostname']] = {
+        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']
+            'username': config['username'],
+            'script_name': script_name
         }
         
     except Exception as e:
-        logger.error(f"Error occurred while checking VPS {config['index']} - {config['hostname']}: {str(e)}")
-        vps_status[config['hostname']] = {
+        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] = {
             'index': config['index'],
             'status': f"Error: {str(e)}",
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
-            'username': config['username']
+            'username': config['username'],
+            'script_name': script_name
         }
     finally:
         if client:
             client.close()
             logger.info(f"SSH connection closed for VPS {config['index']}: {config['hostname']}")
-        logger.info(f"Finished checking VPS {config['index']}: {config['hostname']}")
-        print(f"Finished checking VPS {config['index']}: {config['hostname']}")
+        logger.info(f"Finished checking VPS {config['index']}: {config['hostname']} - {script_name}")
+        print(f"Finished checking VPS {config['index']}: {config['hostname']} - {script_name}")
         sys.stdout.flush()
 
 def check_all_vps():
@@ -118,8 +135,8 @@ def check_all_vps():
     for config in vps_configs:
         check_and_run_script(config)
     logger.info("Finished VPS check")
-    for hostname, status in vps_status.items():
-        print(f"VPS {status['index']} - {hostname}: Status: {status['status']}, Username: {status['username']}")
+    for key, status in vps_status.items():
+        print(f"VPS {status['index']} - {key}: Status: {status['status']}, Username: {status['username']}, Script: {status['script_name']}")
     sys.stdout.flush()
 
 @app.route('/')
@@ -130,14 +147,16 @@ def index():
         <tr>
             <th>Index</th>
             <th>Hostname</th>
+            <th>Script Name</th>
             <th>Status</th>
             <th>Last Check</th>
             <th>Username</th>
         </tr>
-        {% for hostname, data in vps_status.items() %}
+        {% for key, data in vps_status.items() %}
         <tr>
             <td>{{ data.index }}</td>
-            <td><a href="/status/{{ hostname }}">{{ hostname }}</a></td>
+            <td><a href="/status/{{ key }}">{{ key.split(':')[0] }}</a></td>
+            <td>{{ data.script_name }}</td>
             <td>{{ data.status }}</td>
             <td>{{ data.last_check }}</td>
             <td>{{ data.username }}</td>
@@ -147,12 +166,12 @@ def index():
     '''
     return render_template_string(html, vps_status=vps_status)
 
-@app.route('/status/<hostname>')
-def vps_status_detail(hostname):
-    if hostname in vps_status:
-        return jsonify(vps_status[hostname])
+@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 not found"}), 404
+        return jsonify({"error": "VPS or script not found"}), 404
 
 @app.route('/health')
 def health_check():
@@ -180,8 +199,8 @@ def main():
     print(f"Found {len(vps_configs)} VPS configurations")
     sys.stdout.flush()
     for config in vps_configs:
-        logger.info(f"VPS configured: {config['hostname']}")
-        print(f"VPS configured: {config['hostname']}")
+        logger.info(f"VPS configured: {config['hostname']} - {config['script_path']}")
+        print(f"VPS configured: {config['hostname']} - {config['script_path']}")
         sys.stdout.flush()
 
     logger.info("Running initial VPS check")