summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-05-24 15:35:57 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-05-24 15:35:57 +0100
commitc27b83342d1d8ada3fc8a23c058a475a3fbb3578 (patch)
tree4e16a4fe416a94e0ab9ffe34728b4b3167c1aed7
parent2086f0e154c54ab5f179130660ef79f144dc9f7f (diff)
downloadrabbitmq-server-c27b83342d1d8ada3fc8a23c058a475a3fbb3578.tar.gz
Look for the rabbit process, not the rabbit application.
-rw-r--r--src/rabbit.erl2
-rw-r--r--src/rabbit_node_monitor.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 2a70f016..f65a8d68 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 7d844c72..7fcd1f99 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)].