diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-03 15:24:17 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-03 15:24:17 +0000 |
| commit | a8253808e91b19dff6c7bb2b399a04f75005ee7f (patch) | |
| tree | 8350474cd61e0b06f2258dfc4ba0195dc0198a51 | |
| parent | 912fd5c0df7a52e99e5c8386c4f3d9894b324f46 (diff) | |
| download | rabbitmq-server-a8253808e91b19dff6c7bb2b399a04f75005ee7f.tar.gz | |
dafter renaming
| -rw-r--r-- | src/rabbit_alarm.erl | 14 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index 9ce468f0..82c921a2 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -18,7 +18,7 @@ -behaviour(gen_event). --export([start/0, stop/0, register/2, on_node/2]). +-export([start/0, stop/0, register/2, on_node_up/1, on_node_down/1]). -export([init/1, handle_call/2, handle_event/2, handle_info/2, terminate/2, code_change/3]). @@ -35,7 +35,8 @@ -spec(start/0 :: () -> 'ok'). -spec(stop/0 :: () -> 'ok'). -spec(register/2 :: (pid(), mfa_tuple()) -> boolean()). --spec(on_node/2 :: ('up'|'down', node()) -> 'ok'). +-spec(on_node_up/1 :: (node()) -> 'ok'). +-spec(on_node_down/1 :: (node()) -> 'ok'). -endif. @@ -59,8 +60,9 @@ register(Pid, HighMemMFA) -> {register, Pid, HighMemMFA}, infinity). -on_node(Action, Node) -> - gen_event:notify(alarm_handler, {node, Action, Node}). +on_node_up(Node) -> gen_event:notify(alarm_handler, {node_up, Node}). + +on_node_down(Node) -> gen_event:notify(alarm_handler, {node_down, Node}). remote_conserve_memory(Pid, Conserve) -> RemoteNode = node(Pid), @@ -100,14 +102,14 @@ handle_event({clear_alarm, {vm_memory_high_watermark, Node}}, ok = maybe_alert(AN, AN1, State#alarms.alertees, Node, false), {ok, State#alarms{alarmed_nodes = AN1}}; -handle_event({node, up, Node}, State) -> +handle_event({node_up, Node}, State) -> %% Must do this via notify and not call to avoid possible deadlock. ok = gen_event:notify( {alarm_handler, Node}, {register, self(), {?MODULE, remote_conserve_memory, []}}), {ok, State}; -handle_event({node, down, Node}, State = #alarms{alarmed_nodes = AN}) -> +handle_event({node_down, Node}, State = #alarms{alarmed_nodes = AN}) -> AN1 = sets:del_element(Node, AN), ok = maybe_alert(AN, AN1, State#alarms.alertees, Node, false), {ok, State#alarms{alarmed_nodes = AN1}}; diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 061f628d..1917c12c 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -69,7 +69,7 @@ handle_call(_Request, _From, State) -> handle_cast({rabbit_running_on, Node}, State) -> rabbit_log:info("node ~p up~n", [Node]), erlang:monitor(process, {rabbit, Node}), - ok = rabbit_alarm:on_node(up, Node), + ok = rabbit_alarm:on_node_up(Node), {noreply, State}; handle_cast(_Msg, State) -> {noreply, State}. @@ -99,4 +99,4 @@ code_change(_OldVsn, State, _Extra) -> handle_dead_rabbit(Node) -> ok = rabbit_networking:on_node_down(Node), ok = rabbit_amqqueue:on_node_down(Node), - ok = rabbit_alarm:on_node(down, Node). + ok = rabbit_alarm:on_node_down(Node). |