taito0 commited on
Commit
d30f6c6
·
verified ·
1 Parent(s): 7b2b42c

Update vps_monitor.py

Browse files
Files changed (1) hide show
  1. vps_monitor.py +15 -11
vps_monitor.py CHANGED
@@ -108,13 +108,15 @@ def check_all_vps():
108
  table += "+---------+-----------------------+----------+-------------------------+----------+\n"
109
 
110
  # 添加每个VPS的状态
111
- for hostname, status in vps_status.items():
 
 
112
  table += "| {:<7} | {:<21} | {:<8} | {:<23} | {:<8} |\n".format(
113
- status['index'],
114
  hostname[:21],
115
- status['status'][:8],
116
- status['last_check'],
117
- status['username'][:8]
118
  )
119
  table += "+---------+-----------------------+----------+-------------------------+----------+\n"
120
 
@@ -132,18 +134,20 @@ def index():
132
  <th>Last Check</th>
133
  <th>Username</th>
134
  </tr>
135
- {% for hostname, data in vps_status.items() %}
 
 
136
  <tr>
137
- <td>{{ data.index }}</td>
138
  <td><a href="/status/{{ hostname }}">{{ hostname }}</a></td>
139
- <td>{{ data.status }}</td>
140
- <td>{{ data.last_check }}</td>
141
- <td>{{ data.username }}</td>
142
  </tr>
143
  {% endfor %}
144
  </table>
145
  '''
146
- return render_template_string(html, vps_status=vps_status)
147
 
148
  @app.route('/status/<hostname>')
149
  def vps_status_detail(hostname):
 
108
  table += "+---------+-----------------------+----------+-------------------------+----------+\n"
109
 
110
  # 添加每个VPS的状态
111
+ for config in vps_configs:
112
+ hostname = config['hostname']
113
+ status = vps_status.get(hostname, {})
114
  table += "| {:<7} | {:<21} | {:<8} | {:<23} | {:<8} |\n".format(
115
+ status.get('index', ''),
116
  hostname[:21],
117
+ status.get('status', '')[:8],
118
+ status.get('last_check', ''),
119
+ status.get('username', '')[:8]
120
  )
121
  table += "+---------+-----------------------+----------+-------------------------+----------+\n"
122
 
 
134
  <th>Last Check</th>
135
  <th>Username</th>
136
  </tr>
137
+ {% for config in vps_configs %}
138
+ {% set hostname = config['hostname'] %}
139
+ {% set data = vps_status.get(hostname, {}) %}
140
  <tr>
141
+ <td>{{ data.get('index', '') }}</td>
142
  <td><a href="/status/{{ hostname }}">{{ hostname }}</a></td>
143
+ <td>{{ data.get('status', '') }}</td>
144
+ <td>{{ data.get('last_check', '') }}</td>
145
+ <td>{{ data.get('username', '') }}</td>
146
  </tr>
147
  {% endfor %}
148
  </table>
149
  '''
150
+ return render_template_string(html, vps_configs=get_vps_configs(), vps_status=vps_status)
151
 
152
  @app.route('/status/<hostname>')
153
  def vps_status_detail(hostname):