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

Update kick_client API

This commit is contained in:
turtled 2017-08-18 11:44:11 +08:00
parent aeec7804f9
commit f6b9ce84e5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_cli_config.erl
View File

@ -340,5 +340,3 @@ any_to_string(B) when is_binary(B) ->
binary_to_list(B); binary_to_list(B);
any_to_string(L) when is_list(L) -> any_to_string(L) when is_list(L) ->
L. L.

4
src/emqttd_rest_api.erl
View File

@ -24,7 +24,7 @@
-http_api({"^nodes/(.+?)/clients/?$", 'GET', client_list, []}). -http_api({"^nodes/(.+?)/clients/?$", 'GET', client_list, []}).
-http_api({"^nodes/(.+?)/clients/(.+?)/?$", 'GET',client_list, []}). -http_api({"^nodes/(.+?)/clients/(.+?)/?$", 'GET',client_list, []}).
-http_api({"^clients/(.+?)/?$", 'GET', client, []}). -http_api({"^clients/(.+?)/?$", 'GET', client, []}).
-http_api({"^kick_client/(.+?)/?$", 'PUT', kick_client, []}). -http_api({"^clients/(.+?)/?$", 'DELETE', kick_client, []}).
-http_api({"^clean_acl_cache/(.+?)/?$", 'PUT', clean_acl_cache, [{<<"topic">>, binary}]}). -http_api({"^clean_acl_cache/(.+?)/?$", 'PUT', clean_acl_cache, [{<<"topic">>, binary}]}).
-http_api({"^routes?$", 'GET', route_list, []}). -http_api({"^routes?$", 'GET', route_list, []}).
@ -112,7 +112,7 @@ client_list('GET', Params, Node, Key) ->
Data = emqttd_mgmt:client_list(l2a(Node), l2b(Key), PageNo, PageSize), Data = emqttd_mgmt:client_list(l2a(Node), l2b(Key), PageNo, PageSize),
{ok, [{objects, [client_row(Row) || Row <- Data]}]}. {ok, [{objects, [client_row(Row) || Row <- Data]}]}.
kick_client('PUT', _Params, Key) -> kick_client('DELETE', _Params, Key) ->
case emqttd_mgmt:kick_client(l2b(Key)) of case emqttd_mgmt:kick_client(l2b(Key)) of
true -> {ok, []}; true -> {ok, []};
false -> {error, [{code, ?ERROR12}]} false -> {error, [{code, ?ERROR12}]}