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

Merge pull request #12920 from cisiqo/patch-6 

fix: STOMP heartbeat
This commit is contained in:
JianBo He 2024-05-21 16:57:58 +08:00 committed by GitHub
parent 02097b577c cabe2ae100
commit 4f341bef8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/emqx_gateway_stomp/src/emqx_stomp_channel.erl
View File

@ -662,6 +662,13 @@ handle_in(
]
end,
{ok, Outgoings, Channel};
handle_in(
?PACKET(?CMD_HEARTBEAT),
Channel = #channel{heartbeat = Heartbeat}
) ->
NewVal = emqx_pd:get_counter(recv_pkt),
NewHeartbeat = emqx_stomp_heartbeat:reset(incoming, NewVal, Heartbeat),
{ok, Channel#channel{heartbeat = NewHeartbeat}};
handle_in({frame_error, Reason}, Channel = #channel{conn_state = idle}) ->
shutdown(Reason, Channel);
handle_in({frame_error, Reason}, Channel = #channel{conn_state = _ConnState}) ->
@ -1125,19 +1132,9 @@ handle_timeout(
{keepalive_send, NewVal},
Channel = #channel{heartbeat = HrtBt}
) ->
case emqx_stomp_heartbeat:check(outgoing, NewVal, HrtBt) of
{error, timeout} ->
NHrtBt = emqx_stomp_heartbeat:reset(outgoing, NewVal, HrtBt),
NChannel = Channel#channel{heartbeat = NHrtBt},
{ok, {outgoing, emqx_stomp_frame:make(?CMD_HEARTBEAT)},
reset_timer(outgoing_timer, NChannel)};
{ok, NHrtBt} ->
{ok,
reset_timer(
outgoing_timer,
Channel#channel{heartbeat = NHrtBt}
)}
end;
{ok, {outgoing, emqx_stomp_frame:make(?CMD_HEARTBEAT)}, reset_timer(outgoing_timer, NChannel)};
handle_timeout(_TRef, clean_trans, Channel = #channel{transaction = Trans}) ->
Now = erlang:system_time(millisecond),
NTrans = maps:filter(

3
apps/emqx_gateway_stomp/src/emqx_stomp_frame.erl
View File

@ -140,6 +140,9 @@ g(Key, Opts, Val) ->
-spec parse(binary(), parse_state()) -> parse_result().
parse(<<>>, Parser) ->
{more, Parser};
%% treat the \n as a heartbeat frame
parse(<<$\n>>, Parser = #{phase := none}) ->
{ok, #stomp_frame{command = ?CMD_HEARTBEAT}, <<>>, Parser};
parse(Bytes, #{phase := body, length := Len, state := State}) ->
parse(body, Bytes, State, Len);
parse(<<?LF, Bytes/binary>>, #{phase := hdname, state := State}) ->

2
apps/emqx_gateway_stomp/test/emqx_stomp_SUITE.erl
View File

@ -190,7 +190,7 @@ t_heartbeat(_) ->
{<<"host">>, <<"127.0.0.1:61613">>},
{<<"login">>, <<"guest">>},
{<<"passcode">>, <<"guest">>},
{<<"heart-beat">>, <<"1000,800">>}
{<<"heart-beat">>, <<"500,800">>}
]
)
),