diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-18 16:04:00 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-18 16:04:00 +0000 |
| commit | b68204bafb8a2fe4c0b16c21f814fa6331efc413 (patch) | |
| tree | 7e4edf06b642099d0c93a6ff24e0b140ce1038c3 /src | |
| parent | db5fe73482c746da36915bcafcbf47ba0f146eed (diff) | |
| download | rabbitmq-server-git-b68204bafb8a2fe4c0b16c21f814fa6331efc413.tar.gz | |
Don't explode on "rabbitmqctl stop_app ; rabbitmqctl status", and fix tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 7a3746ea1a..503141c26a 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -426,12 +426,16 @@ alarms() -> [Limit || {{resource_limit, Limit, Node}, _} <- Alarms, Node =:= N]. listeners() -> + Listeners = try + rabbit_networking:active_listeners() + catch + exit:{aborted, _} -> [] + end, [{Protocol, Port, rabbit_misc:ntoa(IP)} || #listener{node = Node, protocol = Protocol, ip_address = IP, - port = Port} <- rabbit_networking:active_listeners(), - Node =:= node()]. + port = Port} <- Listeners, Node =:= node()]. is_running() -> is_running(node()). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index ad4cd56098..53858dd0bb 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1236,7 +1236,8 @@ test_amqp_connection_refusal(Header) -> find_listener() -> [#listener{host = H, port = P} | _] = - [L || L = #listener{node = N} <- rabbit_networking:active_listeners(), + [L || L = #listener{node = N, protocol = amqp} + <- rabbit_networking:active_listeners(), N =:= node()], {H, P}. |