Cope slightly if the statistics database is down.

This commit is contained in:
Simon MacMullen 2010-11-08 13:50:57 +00:00
parent 9c2b7444e3
commit a4701d6efd
4 changed files with 27 additions and 15 deletions

View File

@ -40,10 +40,12 @@
</table>
<% if (nodes_interesting) { %>
<p>
You are connected to: <b><%= overview.node %></b>.<br/>
Statistics database on: <b><%= overview.statistics_db_node %></b>.
</p>
<p>You are connected to: <b><%= overview.node %></b>.</p>
<% if (overview.statistics_db_node == 'not_running') { %>
<p class="status-error">Statistics database node could not be contacted. Message rates and queue lengths will not be shown.</p>
<% } else { %>
<p>Statistics database on: <b><%= overview.statistics_db_node %></b>.</b>
<% } %>
<% } %>
</div>

View File

@ -25,7 +25,7 @@
<td><%= fmt_boolean(queue.durable) %></td>
<td><%= fmt_boolean(queue.auto_delete) %></td>
<td>
<% if (queue.owner_pid != 'none') { %>
<% if (queue.owner_pid_details != undefined) { %>
<%= link_conn(queue.owner_pid_details.name) %>
<% } %>
</td>

View File

@ -43,7 +43,7 @@
<td><%= queue.node %></td>
<% } %>
<td>
<% if (queue.owner_pid != 'none') { %>
<% if (queue.owner_pid_details != undefined) { %>
<%= link_conn(queue.owner_pid_details.name) %>
<% } %>
</td>

View File

@ -92,31 +92,41 @@ start_link() ->
end.
get_queues(Qs) ->
gen_server:call({global, ?MODULE}, {get_queues, Qs, list}, infinity).
safe_call({get_queues, Qs, list}, Qs).
get_queue(Q) ->
gen_server:call({global, ?MODULE}, {get_queues, [Q], detail}, infinity).
safe_call({get_queues, [Q], detail}, [Q]).
get_exchanges(Xs) ->
gen_server:call({global, ?MODULE}, {get_exchanges, Xs, list}, infinity).
safe_call({get_exchanges, Xs, list}, Xs).
get_exchange(X) ->
gen_server:call({global, ?MODULE}, {get_exchanges, [X], detail}, infinity).
safe_call({get_exchanges, [X], detail}, [X]).
get_connections() ->
gen_server:call({global, ?MODULE}, get_connections, infinity).
safe_call(get_connections).
get_connection(Name) ->
gen_server:call({global, ?MODULE}, {get_connection, Name}, infinity).
safe_call({get_connection, Name}).
get_channels() ->
gen_server:call({global, ?MODULE}, get_channels, infinity).
safe_call(get_channels).
get_channel(Name) ->
gen_server:call({global, ?MODULE}, {get_channel, Name}, infinity).
safe_call({get_channel, Name}).
get_overview() ->
gen_server:call({global, ?MODULE}, get_overview, infinity).
safe_call(get_overview).
safe_call(Term) ->
safe_call(Term, []).
safe_call(Term, Item) ->
try
gen_server:call({global, ?MODULE}, Term, infinity)
catch exit:{noproc, _} ->
Item
end.
%%----------------------------------------------------------------------------