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

fix issue #346

This commit is contained in:
Feng 2015-10-16 14:58:51 +08:00
parent 61a6818767
commit a35d51ea24
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/emqttd_retained.erl
View File

@ -25,6 +25,7 @@
%%% @end %%% @end
%%%----------------------------------------------------------------------------- %%%-----------------------------------------------------------------------------
%% TODO: should match topic tree
-module(emqttd_retained). -module(emqttd_retained).
-author("Feng Lee <feng@emqtt.io>"). -author("Feng Lee <feng@emqtt.io>").
@ -150,9 +151,9 @@ dispatch(Topic, CPid) when is_binary(Topic) ->
init([]) -> init([]) ->
StatsFun = emqttd_stats:statsfun('retained/count', 'retained/max'), StatsFun = emqttd_stats:statsfun('retained/count', 'retained/max'),
%% One second %% One second
{ok, StatsTimer} = timer:send_interval(1000, stats), {ok, StatsTimer} = timer:send_interval(timer:seconds(1), stats),
%% Five minutes %% Five minutes
{ok, ExpireTimer} = timer:send_interval(300 * 1000, expire), {ok, ExpireTimer} = timer:send_interval(timer:minutes(5), expire),
{ok, #state{stats_fun = StatsFun, {ok, #state{stats_fun = StatsFun,
expired_after = env(expired_after), expired_after = env(expired_after),
stats_timer = StatsTimer, stats_timer = StatsTimer,
@ -169,6 +170,10 @@ handle_info(stats, State = #state{stats_fun = StatsFun}) ->
StatsFun(mnesia:table_info(retained, size)), StatsFun(mnesia:table_info(retained, size)),
{noreply, State, hibernate}; {noreply, State, hibernate};
handle_info(expire, State = #state{expired_after = Never})
when Never =:= 0 orelse Never =:= undefined ->
{noreply, State, hibernate};
handle_info(expire, State = #state{expired_after = ExpiredAfter}) -> handle_info(expire, State = #state{expired_after = ExpiredAfter}) ->
expire(emqttd_util:now_to_secs(os:timestamp()) - ExpiredAfter), expire(emqttd_util:now_to_secs(os:timestamp()) - ExpiredAfter),
{noreply, State, hibernate}; {noreply, State, hibernate};