diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-05-24 15:35:57 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-05-24 15:35:57 +0100 |
| commit | def17a1af52eabe02954ae92c6d1e5ffbd9d49ff (patch) | |
| tree | 4e16a4fe416a94e0ab9ffe34728b4b3167c1aed7 /src | |
| parent | 1b823c17054e5e63ea039cd39b186806a368e8bb (diff) | |
| download | rabbitmq-server-git-def17a1af52eabe02954ae92c6d1e5ffbd9d49ff.tar.gz | |
Look for the rabbit process, not the rabbit application.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2a70f0166a..f65a8d6823 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -421,7 +421,7 @@ status() -> is_running() -> is_running(node()). -is_running(Node) -> rabbit_nodes:is_running(Node, rabbit). +is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). environment() -> lists:keysort(1, [P || P = {K, _} <- application:get_all_env(rabbit), diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 7d844c72d2..7fcd1f9990 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -465,4 +465,4 @@ alive_nodes(Nodes) -> [N || N <- Nodes, pong =:= net_adm:ping(N)]. alive_rabbit_nodes() -> alive_rabbit_nodes(rabbit_mnesia:cluster_nodes(all)). alive_rabbit_nodes(Nodes) -> - [N || N <- alive_nodes(Nodes), rabbit_nodes:is_process_running(N, rabbit)]. + [N || N <- alive_nodes(Nodes), rabbit:is_running(N)]. |