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

fix(gw_jt808): client keepalive timer

This commit is contained in:
JimMoen 2023-12-14 02:27:14 +08:00
parent 0b1838a5ff
commit d1adcd464e
No known key found for this signature in database
GPG Key ID: 87A520B4F76BA86D
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_gateway_gbt32960/src/emqx_gbt32960_channel.erl
View File

@ -416,7 +416,7 @@ handle_info({sock_closed, Reason}, Channel = #channel{conn_state = disconnected}
log(error, #{msg => "unexpected_sock_closed", reason => Reason}, Channel), log(error, #{msg => "unexpected_sock_closed", reason => Reason}, Channel),
{ok, Channel}; {ok, Channel};
handle_info(Info, Channel) -> handle_info(Info, Channel) ->
log(error, #{msg => "unexpected_info}", info => Info}, Channel), log(error, #{msg => "unexpected_info", info => Info}, Channel),
{ok, Channel}. {ok, Channel}.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------

7
apps/emqx_gateway_jt808/src/emqx_jt808_channel.erl
View File

@ -48,7 +48,7 @@
%% AuthCode %% AuthCode
authcode :: undefined | anonymous | binary(), authcode :: undefined | anonymous | binary(),
%% Keepalive %% Keepalive
keepalive, keepalive :: maybe(emqx_keepalive:keepalive()),
%% Msg SN %% Msg SN
msg_sn, msg_sn,
%% Down Topic %% Down Topic
@ -188,7 +188,7 @@ init(
conn_state = idle, conn_state = idle,
timers = #{}, timers = #{},
authcode = undefined, authcode = undefined,
keepalive = maps:get(keepalive, Options, ?DEFAULT_KEEPALIVE), keepalive = undefined,
msg_sn = 0, msg_sn = 0,
% TODO: init rsa_key from user input % TODO: init rsa_key from user input
dn_topic = maps:get(dn_topic, ProtoConf, ?DEFAULT_DN_TOPIC), dn_topic = maps:get(dn_topic, ProtoConf, ?DEFAULT_DN_TOPIC),
@ -475,6 +475,9 @@ handle_info(
handle_info({sock_closed, Reason}, Channel = #channel{conn_state = disconnected}) -> handle_info({sock_closed, Reason}, Channel = #channel{conn_state = disconnected}) ->
log(error, #{msg => "unexpected_sock_closed", reason => Reason}, Channel), log(error, #{msg => "unexpected_sock_closed", reason => Reason}, Channel),
{ok, Channel}; {ok, Channel};
handle_info({keepalive, start, Interval}, Channel) ->
NChannel = Channel#channel{keepalive = emqx_keepalive:init(Interval)},
{ok, ensure_timer(alive_timer, NChannel)};
handle_info(Info, Channel) -> handle_info(Info, Channel) ->
log(error, #{msg => "unexpected_info", info => Info}, Channel), log(error, #{msg => "unexpected_info", info => Info}, Channel),
{ok, Channel}. {ok, Channel}.