Update vps_monitor.py

vps_monitor.py

@@ -77,8 +77,9 @@ def check_and_run_script(config):
             status = "Restarted"
             logger.info(f"Script restarted on {config['hostname']}")
         
-        vps_status[config['hostname']] = {
+        vps_status[config['index']] = {
             'index': config['index'],
+            'hostname': config['hostname'],
             'status': status,
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username']
@@ -86,8 +87,9 @@ def check_and_run_script(config):
         
     except Exception as e:
         logger.error(f"Error occurred while checking VPS {config['index']} - {config['hostname']}: {str(e)}")
-        vps_status[config['hostname']] = {
+        vps_status[config['index']] = {
             'index': config['index'],
+            'hostname': config['hostname'],
             'status': f"Error: {str(e)}",
             'last_check': time.strftime('%Y-%m-%d %H:%M:%S'),
             'username': config['username']
@@ -108,15 +110,14 @@ def check_all_vps():
     table += "+---------+-----------------------+----------+-------------------------+----------+\n"
     
     # 添加每个VPS的状态
-    for config in vps_configs:
-        hostname = config['hostname']
-        status = vps_status.get(hostname, {})
+    for index in sorted(vps_status.keys()):
+        status = vps_status[index]
         table += "| {:<7} | {:<21} | {:<8} | {:<23} | {:<8} |\n".format(
-            status.get('index', ''),
-            hostname[:21],
-            status.get('status', '')[:8],
-            status.get('last_check', ''),
-            status.get('username', '')[:8]
+            status['index'],
+            status['hostname'][:21],
+            status['status'][:8],
+            status['last_check'],
+            status['username'][:8]
         )
         table += "+---------+-----------------------+----------+-------------------------+----------+\n"
     
@@ -134,25 +135,24 @@ def index():
             <th>Last Check</th>
             <th>Username</th>
         </tr>
-        {% for config in vps_configs %}
-        {% set hostname = config['hostname'] %}
-        {% set data = vps_status.get(hostname, {}) %}
+        {% for index in vps_status.keys()|sort %}
+        {% set data = vps_status[index] %}
         <tr>
-            <td>{{ data.get('index', '') }}</td>
-            <td><a href="/status/{{ hostname }}">{{ hostname }}</a></td>
-            <td>{{ data.get('status', '') }}</td>
-            <td>{{ data.get('last_check', '') }}</td>
-            <td>{{ data.get('username', '') }}</td>
+            <td>{{ data['index'] }}</td>
+            <td><a href="/status/{{ data['index'] }}">{{ data['hostname'] }}</a></td>
+            <td>{{ data['status'] }}</td>
+            <td>{{ data['last_check'] }}</td>
+            <td>{{ data['username'] }}</td>
         </tr>
         {% endfor %}
     </table>
     '''
-    return render_template_string(html, vps_configs=get_vps_configs(), vps_status=vps_status)
+    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/<int:index>')
+def vps_status_detail(index):
+    if index in vps_status:
+        return jsonify(vps_status[index])
     else:
         return jsonify({"error": "VPS not found"}), 404