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

fix issue #479

This commit is contained in:
Feng 2016-03-21 10:08:59 +08:00
parent 2a16888f07
commit e88fe8b6ae
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rel/files/emqttd.config.development
View File

@ -104,8 +104,8 @@
%% Statistics Collection Interval(seconds) %% Statistics Collection Interval(seconds)
{collect_interval, 20}, {collect_interval, 20},
%% Expired after 2 days %% Expired after 2 day (unit: minute)
{expired_after, 48} {expired_after, 2880}
]}, ]},
%% Queue %% Queue
@ -176,11 +176,12 @@
%% Subscribe topics automatically when client connected %% Subscribe topics automatically when client connected
{subscription, [ {subscription, [
%% Static subscriptions from backend
backend,
%% $c will be replaced by clientid %% $c will be replaced by clientid
{"$queue/clients/$c", 1} %% {"$queue/clients/$c", 1},
%% Static subscriptions from backend
backend
]} ]}
%% Rewrite rules %% Rewrite rules

11
rel/files/emqttd.config.production
View File

@ -96,8 +96,8 @@
%% Statistics Collection Interval(seconds) %% Statistics Collection Interval(seconds)
{collect_interval, 0}, {collect_interval, 0},
%% Expired after 2 days %% Expired after 2 day (unit: minute)
{expired_after, 48} {expired_after, 2880}
]}, ]},
%% Queue %% Queue
@ -168,11 +168,12 @@
%% Subscribe topics automatically when client connected %% Subscribe topics automatically when client connected
{subscription, [ {subscription, [
%% Static subscriptions from backend
backend,
%% $c will be replaced by clientid %% $c will be replaced by clientid
{"$queue/clients/$c", 1} %% {"$queue/clients/$c", 1},
%% Static subscriptions from backend
backend
]} ]}
%% Rewrite rules %% Rewrite rules

2
src/emqttd_session.erl
View File

@ -230,7 +230,7 @@ init([CleanSess, ClientId, ClientPid]) ->
retry_interval = get_value(unack_retry_interval, SessEnv), retry_interval = get_value(unack_retry_interval, SessEnv),
await_rel_timeout = get_value(await_rel_timeout, SessEnv), await_rel_timeout = get_value(await_rel_timeout, SessEnv),
max_awaiting_rel = get_value(max_awaiting_rel, SessEnv), max_awaiting_rel = get_value(max_awaiting_rel, SessEnv),
expired_after = get_value(expired_after, SessEnv) * 3600, expired_after = get_value(expired_after, SessEnv) * 60,
collect_interval = get_value(collect_interval, SessEnv, 0), collect_interval = get_value(collect_interval, SessEnv, 0),
timestamp = os:timestamp()}, timestamp = os:timestamp()},
emqttd_sm:register_session(CleanSess, ClientId, sess_info(Session)), emqttd_sm:register_session(CleanSess, ClientId, sess_info(Session)),