From 89cd68d36f57d0817cbd8f9f5e43622f23db59fc Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Tue, 2 Nov 2021 09:31:53 +0100 Subject: [PATCH] refactor(persistent_sessions): fix coding style --- apps/emqx/src/emqx_cm.erl | 4 +++- apps/emqx/test/emqx_persistent_session_SUITE.erl | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl index dbd8dfa63..890dce60a 100644 --- a/apps/emqx/src/emqx_cm.erl +++ b/apps/emqx/src/emqx_cm.erl @@ -58,6 +58,7 @@ , lookup_channels/2 ]). +%% Test/debug interface -export([ all_channels/0 , all_client_ids/0 ]). @@ -397,11 +398,12 @@ with_channel(ClientId, Fun) -> Pids -> Fun(lists:last(Pids)) end. -%% @doc Get all channels registed. +%% @doc Get all registed channel pids. Debugg/test interface all_channels() -> Pat = [{{'_', '$1'}, [], ['$1']}], ets:select(?CHAN_TAB, Pat). +%% @doc Get all registed clientIDs. Debugg/test interface all_client_ids() -> Pat = [{{'$1', '_'}, [], ['$1']}], ets:select(?CHAN_TAB, Pat). diff --git a/apps/emqx/test/emqx_persistent_session_SUITE.erl b/apps/emqx/test/emqx_persistent_session_SUITE.erl index d5637cad2..bcc8d5e69 100644 --- a/apps/emqx/test/emqx_persistent_session_SUITE.erl +++ b/apps/emqx/test/emqx_persistent_session_SUITE.erl @@ -113,8 +113,9 @@ init_per_group(snabbkaffe, Config) -> [ {kill_connection_process, true} | Config]; init_per_group(gc_tests, Config) -> %% We need to make sure the system does not interfere with this test group. - [maybe_kill_connection_process(ClientId, [{kill_connection_process, true}]) - || ClientId <- emqx_cm:all_client_ids()], + lists:foreach(fun(ClientId) -> + maybe_kill_connection_process(ClientId, [{kill_connection_process, true}]) + end, emqx_cm:all_client_ids()), emqx_common_test_helpers:stop_apps([]), SessionMsgEts = gc_tests_session_store, MsgEts = gc_tests_msg_store,