root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Format per-node vhost state on the vhost page. Change vhsot status from down to stopped

This commit is contained in:
Daniil Fedotov 2017-08-02 15:39:48 +01:00
parent 1e96b92eda
commit 6b2cb31773
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbitmq_management/priv/www/js/formatters.js vendored
View File

@ -933,7 +933,7 @@ function fmt_vhost_state(vhost){
var non_ok_count = 0;
for(var node in cluster_state){
var node_state = cluster_state[node];
if(cluster_state[node] == "down" || cluster_state[node] == "nodedown"){
if(cluster_state[node] == "stopped" || cluster_state[node] == "nodedown"){
non_ok_count++;
down_nodes.push(node);
} else if(cluster_state[node] == "running"){
@ -943,9 +943,9 @@ function fmt_vhost_state(vhost){
if(non_ok_count == 0 ){
return fmt_state('green', 'running', '');
} else if(non_ok_count > 0 && ok_count == 0){
return fmt_state('red', 'down', 'Vhost supervisor is not running.');
return fmt_state('red', 'stopped', 'Vhost supervisor is not running.');
} else if(non_ok_count > 0 && ok_count > 0){
return fmt_state('yellow', 'partial', 'Vhost supervisor is down on some cluster nodes: ' + down_nodes.join(', '));
return fmt_state('yellow', 'partial', 'Vhost supervisor is stopped on some cluster nodes: ' + down_nodes.join(', '));
}
}

11
deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs vendored
View File

@ -22,7 +22,16 @@
<td><%= fmt_boolean(vhost.tracing) %></td>
<tr>
<th>State:</th>
<td><%= vhost.cluster_state %></td>
<td>
<table class="mini">
<% for (var node in vhost.cluster_state) { %>
<tr>
<th><%= fmt_escape_html(node) %> :</th>
<td><%= vhost.cluster_state[node] %></td>
</tr>
<% } %>
</table>
</td>
</tr>
</table>
</div>