diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-07-28 16:18:28 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-07-28 16:18:28 +0300 |
| commit | 070182621ff16643080cefad57a3df4c57fe0466 (patch) | |
| tree | 3813436bf7cd20a23ec13d8046d37b25551d948f /src | |
| parent | 2288c7455449c5043fd0612a9fc8cc25edb99082 (diff) | |
| parent | 5bcf3bafa558ec361002e87c89b3f0b6b3a14069 (diff) | |
| download | rabbitmq-server-git-070182621ff16643080cefad57a3df4c57fe0466.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 7f410ac752..e8af7b329e 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -988,6 +988,9 @@ nodes_in_cluster(Node, Timeout) -> unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running], Timeout). alarms_by_node(Name) -> - Status = unsafe_rpc(Name, rabbit, status, []), - {_, As} = lists:keyfind(alarms, 1, Status), - {Name, As}. + case rpc_call(Name, rabbit, status, []) of + {badrpc,nodedown} -> {Name, [nodedown]}; + Status -> + {_, As} = lists:keyfind(alarms, 1, Status), + {Name, As} + end. |