From a7ed2c402b57868b83c2fc49a243bc5453b0fef6 Mon Sep 17 00:00:00 2001 From: turtled Date: Sat, 18 Feb 2017 15:03:41 +0800 Subject: [PATCH] fix #885 --- src/emqttd_acl_internal.erl | 3 ++- src/emqttd_cli.erl | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/emqttd_acl_internal.erl b/src/emqttd_acl_internal.erl index f1c8b801b..1cd32c0f4 100644 --- a/src/emqttd_acl_internal.erl +++ b/src/emqttd_acl_internal.erl @@ -21,6 +21,7 @@ -author("Feng Lee "). -include("emqttd.hrl"). +-include("emqttd_cli.hrl"). -export([all_rules/0]). @@ -114,7 +115,7 @@ reload_acl(#state{config = undefined}) -> reload_acl(State) -> case catch load_rules_from_file(State) of {'EXIT', Error} -> {error, Error}; - true -> ok + true -> ?PRINT("~s~n", ["reload acl_internal successfully"]), ok end. %% @doc ACL Module Description diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index 5a4de3fab..cb4438cc8 100644 --- a/src/emqttd_cli.erl +++ b/src/emqttd_cli.erl @@ -32,7 +32,7 @@ -export([status/1, broker/1, cluster/1, users/1, clients/1, sessions/1, routes/1, topics/1, subscriptions/1, plugins/1, bridges/1, - listeners/1, vm/1, mnesia/1, trace/1]). + listeners/1, vm/1, mnesia/1, trace/1, acl/1]). -define(PROC_INFOKEYS, [status, memory, @@ -151,6 +151,9 @@ cluster(_) -> users(Args) -> emq_auth_username:cli(Args). +acl(["reload"]) -> emqttd_access_control:reload_acl(); +acl(_) -> ?USAGE([{"acl reload", "reload etc/acl.conf"}]). + %%-------------------------------------------------------------------- %% @doc Query clients