turtled 9 лет назад
Родитель
Сommit
a7ed2c402b
2 измененных файлов с 6 добавлено и 2 удалено
  1. 2 1
      src/emqttd_acl_internal.erl
  2. 4 1
      src/emqttd_cli.erl

+ 2 - 1
src/emqttd_acl_internal.erl

@@ -21,6 +21,7 @@
 -author("Feng Lee <feng@emqtt.io>").
 
 -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

+ 4 - 1
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