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

fix(coap): fix system topic case

This commit is contained in:
firest 2022-03-23 17:25:52 +08:00
parent ab51d8ab8e
commit ab2f5b9bb7
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_gateway/src/coap/emqx_coap_channel.erl
View File

@ -638,8 +638,8 @@ process_connection({open, Req}, Result,
Channel); Channel);
process_connection({close, Msg}, _, Channel, _) -> process_connection({close, Msg}, _, Channel, _) ->
Reply = emqx_coap_message:piggyback({ok, deleted}, Msg), Reply = emqx_coap_message:piggyback({ok, deleted}, Msg),
NChannel = ensure_disconnected(close_connection, Channel), NChannel = ensure_disconnected(normal, Channel),
{shutdown, close, Reply, NChannel}. {shutdown, normal, Reply, NChannel}.
process_subscribe({Sub, Msg}, Result, #channel{session = Session} = Channel, Iter) -> process_subscribe({Sub, Msg}, Result, #channel{session = Session} = Channel, Iter) ->
Result2 = emqx_coap_session:process_subscribe(Sub, Msg, Result, Session), Result2 = emqx_coap_session:process_subscribe(Sub, Msg, Result, Session),

30
apps/emqx_gateway/test/emqx_coap_SUITE.erl
View File

@ -294,26 +294,30 @@ t_clients_get_subscription_api(_) ->
t_on_offline_event(_) -> t_on_offline_event(_) ->
Fun = fun(Channel) -> Fun = fun(Channel) ->
application:start(emqx_modules), emqx_hooks:add('client.connected', {emqx_sys, on_client_connected, []}),
emqx_event_message_SUITE:load_config(), emqx_hooks:add('client.disconnected', {emqx_sys, on_client_disconnected, []}),
ConnectedSub = <<"$SYS/brokers/+/gateway/coap/clients/+/connected">>,
emqx_broker:subscribe(ConnectedSub),
timer:sleep(100), timer:sleep(100),
emqx_event_message:enable(),
timer:sleep(200),
emqx_broker:subscribe(<<"$event/#">>),
Token = connection(Channel), Token = connection(Channel),
?assertMatch(#message{topic = <<"$event/client_connected">>}, receive_deliver(500)), ?assertMatch(#message{}, receive_deliver(500)),
DisconnectedSub = <<"$SYS/brokers/+/gateway/coap/clients/+/disconnected">>,
emqx_broker:subscribe(DisconnectedSub),
timer:sleep(100),
disconnection(Channel, Token), disconnection(Channel, Token),
?assertMatch(#message{topic = <<"$event/client_disconnected">>}, receive_deliver(500)), ?assertMatch(#message{}, receive_deliver(500)),
emqx_broker:unsubscribe(<<"$event/#">>), emqx_broker:unsubscribe(ConnectedSub),
emqx_event_message:disable(), emqx_broker:unsubscribe(DisconnectedSub),
application:stop(emqx_modules),
timer:sleep(200) emqx_hooks:del('client.connected', {emqx_sys, on_client_connected}),
emqx_hooks:del('client.disconnected', {emqx_sys, on_client_disconnected}),
timer:sleep(500)
end, end,
do(Fun). do(Fun).