diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-08-08 18:07:11 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-08-08 18:07:11 +0100 |
| commit | f5ce49652d4e5c143e356969e9b7bc9e665e617d (patch) | |
| tree | b302b8d5b81292c6db673a7549e4790883143c03 | |
| parent | bac19903bba5294cf3e9f242c093534b86775b02 (diff) | |
| parent | 107eddef027a5f82f434d52e3695509402d25602 (diff) | |
| download | rabbitmq-server-f5ce49652d4e5c143e356969e9b7bc9e665e617d.tar.gz | |
merge bug24322 into default
| -rw-r--r-- | src/rabbit_node_monitor.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 1f30a2fc..78aeb2ef 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -60,24 +60,19 @@ notify_cluster() -> %%-------------------------------------------------------------------- init([]) -> - ok = net_kernel:monitor_nodes(true), {ok, no_state}. handle_call(_Request, _From, State) -> {noreply, State}. handle_cast({rabbit_running_on, Node}, State) -> - rabbit_log:info("node ~p up~n", [Node]), + rabbit_log:info("rabbit on ~p up~n", [Node]), erlang:monitor(process, {rabbit, Node}), ok = rabbit_alarm:on_node_up(Node), {noreply, State}; handle_cast(_Msg, State) -> {noreply, State}. -handle_info({nodedown, Node}, State) -> - rabbit_log:info("node ~p down~n", [Node]), - ok = handle_dead_rabbit(Node), - {noreply, State}; handle_info({'DOWN', _MRef, process, {rabbit, Node}, _Reason}, State) -> rabbit_log:info("node ~p lost 'rabbit'~n", [Node]), ok = handle_dead_rabbit(Node), |