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

fix(emqx_mgmt_cli): idempontent kick. now it always returns ok

This commit is contained in:
Zaiming Shi 2021-10-30 15:22:01 +02:00
parent 7f4809f61a
commit 765a76fa80
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_management/src/emqx_mgmt_cli.erl
View File

@ -191,10 +191,8 @@ clients(["show", ClientId]) ->
if_client(ClientId, fun print/1); if_client(ClientId, fun print/1);
clients(["kick", ClientId]) -> clients(["kick", ClientId]) ->
case emqx_cm:kick_session(bin(ClientId)) of ok = emqx_cm:kick_session(bin(ClientId)),
ok -> emqx_ctl:print("ok~n"); emqx_ctl:print("ok~n");
_ -> emqx_ctl:print("Not Found.~n")
end;
clients(_) -> clients(_) ->
emqx_ctl:usage([{"clients list", "List all clients"}, emqx_ctl:usage([{"clients list", "List all clients"},

4
apps/emqx_management/test/emqx_mgmt_SUITE.erl
View File

@ -158,9 +158,9 @@ t_clients_cmd(_) ->
timer:sleep(300), timer:sleep(300),
emqx_mgmt_cli:clients(["list"]), emqx_mgmt_cli:clients(["list"]),
?assertMatch({match, _}, re:run(emqx_mgmt_cli:clients(["show", "client12"]), "client12")), ?assertMatch({match, _}, re:run(emqx_mgmt_cli:clients(["show", "client12"]), "client12")),
?assertEqual((emqx_mgmt_cli:clients(["kick", "client12"])), "ok~n"), ?assertEqual("ok~n", emqx_mgmt_cli:clients(["kick", "client12"])),
timer:sleep(500), timer:sleep(500),
?assertMatch({match, _}, re:run(emqx_mgmt_cli:clients(["show", "client12"]), "Not Found")), ?assertEqual("ok~n", emqx_mgmt_cli:clients(["kick", "client12"])),
receive receive
{'EXIT', T, _} -> {'EXIT', T, _} ->
ok ok

4
apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
View File

@ -223,8 +223,8 @@ t_clients(_) ->
timer:sleep(300), timer:sleep(300),
{ok, NotFound0} = request_api(delete, api_path(["clients", binary_to_list(ClientId1)]), auth_header_()), {ok, Ok1} = request_api(delete, api_path(["clients", binary_to_list(ClientId1)]), auth_header_()),
?assertEqual(?ERROR12, get(<<"code">>, NotFound0)), ?assertEqual(?SUCCESS, get(<<"code">>, Ok1)),
{ok, Clients6} = request_api(get, api_path(["clients"]), "_limit=100&_page=1", auth_header_()), {ok, Clients6} = request_api(get, api_path(["clients"]), "_limit=100&_page=1", auth_header_()),
?assertEqual(1, maps:get(<<"count">>, get(<<"meta">>, Clients6))), ?assertEqual(1, maps:get(<<"count">>, get(<<"meta">>, Clients6))),