summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-01-31 10:07:13 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-01-31 10:07:13 +0000
commit9f354ec05ce5e37a214e4d1caca1d003bc964bda (patch)
tree851acaec22e916b7f09f026f9af2b34e76fd3891
parent8a9c48c119704a6be63acdc03c805d20bd84286c (diff)
parent64ce2d2870972fb4cd32dc048cc03ee192383f58 (diff)
downloadrabbitmq-server-9f354ec05ce5e37a214e4d1caca1d003bc964bda.tar.gz
merge from default
-rw-r--r--src/rabbit.erl1
-rw-r--r--src/rabbit_node_monitor.erl5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c6661d39..9a938d10 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -225,6 +225,7 @@ start(normal, []) ->
case erts_version_check() of
ok ->
{ok, SupPid} = rabbit_sup:start_link(),
+ register(rabbit, self()),
print_banner(),
[ok = run_boot_step(Step) || Step <- boot_steps()],
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index e4bc1cdc..bce5ec12 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -44,6 +44,8 @@ handle_cast(_Msg, State) ->
handle_info({nodeup, Node}, State) ->
rabbit_log:info("node ~p up", [Node]),
+ erlang:monitor(process, {rabbit, Node}),
+ io:format("monitored 'rabbit' on ~p~n", [Node]),
{noreply, State};
handle_info({nodedown, Node}, State) ->
rabbit_log:info("node ~p down", [Node]),
@@ -53,6 +55,9 @@ handle_info({nodedown, Node}, State) ->
ok = rabbit_networking:on_node_down(Node),
ok = rabbit_amqqueue:on_node_down(Node),
{noreply, State};
+handle_info({'DOWN', _MRef, process, {rabbit, Node}, _Reason}, State) ->
+ io:format("node ~p lost 'rabbit'~n", [Node]),
+ {noreply, State};
handle_info(_Info, State) ->
{noreply, State}.