yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Monitor/Unmonitor membership events

This commit is contained in:
Feng Lee 2017-06-28 15:51:24 +08:00
parent cc6696f8cb
commit 8a804c56f3
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emqttd_router.erl
View File

@ -216,7 +216,7 @@ stop() -> gen_server:call(?ROUTER, stop).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
init([]) -> init([]) ->
ekka:subscribe(membership), ekka:monitor(membership),
ets:new(mqtt_local_route, [set, named_table, protected]), ets:new(mqtt_local_route, [set, named_table, protected]),
{ok, TRef} = timer:send_interval(timer:seconds(1), stats), {ok, TRef} = timer:send_interval(timer:seconds(1), stats),
{ok, #state{stats_timer = TRef}}. {ok, #state{stats_timer = TRef}}.
@ -239,14 +239,15 @@ handle_cast({del_local_route, Topic}, State) ->
handle_cast(_Msg, State) -> handle_cast(_Msg, State) ->
{noreply, State}. {noreply, State}.
handle_info({membership, {member_up, _Node}}, State) -> handle_info({membership, {mnesia, down, Node}}, State) ->
{noreply, State};
handle_info({membership, {member_down, Node}}, State) ->
clean_routes_(Node), clean_routes_(Node),
update_stats_(), update_stats_(),
{noreply, State, hibernate}; {noreply, State, hibernate};
handle_info({membership, _Event}, State) ->
%% ignore
{noreply, State};
handle_info(stats, State) -> handle_info(stats, State) ->
update_stats_(), update_stats_(),
{noreply, State, hibernate}; {noreply, State, hibernate};
@ -256,7 +257,7 @@ handle_info(_Info, State) ->
terminate(_Reason, #state{stats_timer = TRef}) -> terminate(_Reason, #state{stats_timer = TRef}) ->
timer:cancel(TRef), timer:cancel(TRef),
ekka:unsubscribe(membership). ekka:unmonitor(membership).
code_change(_OldVsn, State, _Extra) -> code_change(_OldVsn, State, _Extra) ->
{ok, State}. {ok, State}.

9
src/emqttd_sm_helper.erl
View File

@ -42,7 +42,7 @@ start_link(StatsFun) ->
gen_server:start_link({local, ?MODULE}, ?MODULE, [StatsFun], []). gen_server:start_link({local, ?MODULE}, ?MODULE, [StatsFun], []).
init([StatsFun]) -> init([StatsFun]) ->
ekka:subscribe(membership), ekka:monitor(membership),
{ok, TRef} = timer:send_interval(timer:seconds(1), tick), {ok, TRef} = timer:send_interval(timer:seconds(1), tick),
{ok, #state{stats_fun = StatsFun, ticker = TRef}}. {ok, #state{stats_fun = StatsFun, ticker = TRef}}.
@ -52,7 +52,7 @@ handle_call(Req, _From, State) ->
handle_cast(Msg, State) -> handle_cast(Msg, State) ->
?UNEXPECTED_MSG(Msg, State). ?UNEXPECTED_MSG(Msg, State).
handle_info({membership, {mnesia_down, Node}}, State) -> handle_info({membership, {mnesia, down, Node}}, State) ->
Fun = fun() -> Fun = fun() ->
ClientIds = ClientIds =
mnesia:select(mqtt_session, [{#mqtt_session{client_id = '$1', sess_pid = '$2', _ = '_'}, mnesia:select(mqtt_session, [{#mqtt_session{client_id = '$1', sess_pid = '$2', _ = '_'},
@ -62,9 +62,6 @@ handle_info({membership, {mnesia_down, Node}}, State) ->
mnesia:async_dirty(Fun), mnesia:async_dirty(Fun),
{noreply, State}; {noreply, State};
handle_info({membership, {mnesia_up, _Node}}, State) ->
{noreply, State};
handle_info({membership, _Event}, State) -> handle_info({membership, _Event}, State) ->
{noreply, State}; {noreply, State};
@ -76,7 +73,7 @@ handle_info(Info, State) ->
terminate(_Reason, _State = #state{ticker = TRef}) -> terminate(_Reason, _State = #state{ticker = TRef}) ->
timer:cancel(TRef), timer:cancel(TRef),
ekka:unsubscribe(membership). ekka:unmonitor(membership).
code_change(_OldVsn, State, _Extra) -> code_change(_OldVsn, State, _Extra) ->
{ok, State}. {ok, State}.