|
@@ -585,7 +585,7 @@ delete_all_deactivated_alarms() ->
|
|
|
|
|
|
|
|
delete_all_deactivated_alarms(Node) when Node =:= node() ->
|
|
delete_all_deactivated_alarms(Node) when Node =:= node() ->
|
|
|
emqx_alarm:delete_all_deactivated_alarms();
|
|
emqx_alarm:delete_all_deactivated_alarms();
|
|
|
-delete_all_deactivated_alarms(Node) ->
|
|
|
|
|
|
|
+delete_all_deactivated_alarms(Node) ->
|
|
|
rpc_call(Node, delete_deactivated_alarms, [Node]).
|
|
rpc_call(Node, delete_deactivated_alarms, [Node]).
|
|
|
|
|
|
|
|
%%--------------------------------------------------------------------
|
|
%%--------------------------------------------------------------------
|
|
@@ -664,7 +664,7 @@ export_auth_username() ->
|
|
|
export_auth_mnesia() ->
|
|
export_auth_mnesia() ->
|
|
|
case ets:info(emqx_user) of
|
|
case ets:info(emqx_user) of
|
|
|
undefined -> [];
|
|
undefined -> [];
|
|
|
- _ ->
|
|
|
|
|
|
|
+ _ ->
|
|
|
lists:foldl(fun({_, Login, Password, IsSuperuser}, Acc) ->
|
|
lists:foldl(fun({_, Login, Password, IsSuperuser}, Acc) ->
|
|
|
[[{login, Login}, {password, Password}, {is_superuser, IsSuperuser}] | Acc]
|
|
[[{login, Login}, {password, Password}, {is_superuser, IsSuperuser}] | Acc]
|
|
|
end, [], ets:tab2list(emqx_user))
|
|
end, [], ets:tab2list(emqx_user))
|
|
@@ -764,7 +764,7 @@ import_auth_clientid(Lists) ->
|
|
|
case ets:info(emqx_auth_clientid) of
|
|
case ets:info(emqx_auth_clientid) of
|
|
|
undefined -> ok;
|
|
undefined -> ok;
|
|
|
_ ->
|
|
_ ->
|
|
|
- [ mnesia:dirty_write({emqx_auth_clientid, ClientId, Password}) || #{<<"clientid">> := ClientId,
|
|
|
|
|
|
|
+ [ mnesia:dirty_write({emqx_auth_clientid, ClientId, Password}) || #{<<"clientid">> := ClientId,
|
|
|
<<"password">> := Password} <- Lists ]
|
|
<<"password">> := Password} <- Lists ]
|
|
|
end.
|
|
end.
|
|
|
|
|
|
|
@@ -772,14 +772,14 @@ import_auth_username(Lists) ->
|
|
|
case ets:info(emqx_auth_username) of
|
|
case ets:info(emqx_auth_username) of
|
|
|
undefined -> ok;
|
|
undefined -> ok;
|
|
|
_ ->
|
|
_ ->
|
|
|
- [ mnesia:dirty_write({emqx_auth_username, Username, Password}) || #{<<"username">> := Username,
|
|
|
|
|
|
|
+ [ mnesia:dirty_write({emqx_auth_username, Username, Password}) || #{<<"username">> := Username,
|
|
|
<<"password">> := Password} <- Lists ]
|
|
<<"password">> := Password} <- Lists ]
|
|
|
end.
|
|
end.
|
|
|
|
|
|
|
|
import_auth_mnesia(Auths) ->
|
|
import_auth_mnesia(Auths) ->
|
|
|
case ets:info(emqx_user) of
|
|
case ets:info(emqx_user) of
|
|
|
undefined -> ok;
|
|
undefined -> ok;
|
|
|
- _ ->
|
|
|
|
|
|
|
+ _ ->
|
|
|
[ mnesia:dirty_write({emqx_user, Login, Password, IsSuperuser}) || #{<<"login">> := Login,
|
|
[ mnesia:dirty_write({emqx_user, Login, Password, IsSuperuser}) || #{<<"login">> := Login,
|
|
|
<<"password">> := Password,
|
|
<<"password">> := Password,
|
|
|
<<"is_superuser">> := IsSuperuser} <- Auths ]
|
|
<<"is_superuser">> := IsSuperuser} <- Auths ]
|
|
@@ -788,14 +788,14 @@ import_auth_mnesia(Auths) ->
|
|
|
import_acl_mnesia(Acls) ->
|
|
import_acl_mnesia(Acls) ->
|
|
|
case ets:info(emqx_acl) of
|
|
case ets:info(emqx_acl) of
|
|
|
undefined -> ok;
|
|
undefined -> ok;
|
|
|
- _ ->
|
|
|
|
|
- [ mnesia:dirty_write({emqx_acl ,Login, Topic, Action, Allow}) || #{<<"login">> := Login,
|
|
|
|
|
|
|
+ _ ->
|
|
|
|
|
+ [ mnesia:dirty_write({emqx_acl ,Login, Topic, Action, Allow}) || #{<<"login">> := Login,
|
|
|
<<"topic">> := Topic,
|
|
<<"topic">> := Topic,
|
|
|
<<"action">> := Action,
|
|
<<"action">> := Action,
|
|
|
<<"allow">> := Allow} <- Acls ]
|
|
<<"allow">> := Allow} <- Acls ]
|
|
|
end.
|
|
end.
|
|
|
|
|
|
|
|
-import_schemas(Schemas) ->
|
|
|
|
|
|
|
+import_schemas(Schemas) ->
|
|
|
case ets:info(emqx_schema) of
|
|
case ets:info(emqx_schema) of
|
|
|
undefined -> ok;
|
|
undefined -> ok;
|
|
|
_ -> [emqx_schema_registry:add_schema(emqx_schema_api:make_schema_params(Schema)) || Schema <- Schemas]
|
|
_ -> [emqx_schema_registry:add_schema(emqx_schema_api:make_schema_params(Schema)) || Schema <- Schemas]
|
|
@@ -817,7 +817,7 @@ to_version(Version) when is_list(Version) ->
|
|
|
%%--------------------------------------------------------------------
|
|
%%--------------------------------------------------------------------
|
|
|
|
|
|
|
|
enable_telemetry() ->
|
|
enable_telemetry() ->
|
|
|
- [enable_telemetry(Node) || Node <- ekka_mnesia:running_nodes()], ok.
|
|
|
|
|
|
|
+ lists:foreach(fun enable_telemetry/1,ekka_mnesia:running_nodes()).
|
|
|
|
|
|
|
|
enable_telemetry(Node) when Node =:= node() ->
|
|
enable_telemetry(Node) when Node =:= node() ->
|
|
|
emqx_telemetry:enable();
|
|
emqx_telemetry:enable();
|
|
@@ -825,7 +825,7 @@ enable_telemetry(Node) ->
|
|
|
rpc_call(Node, enable_telemetry, [Node]).
|
|
rpc_call(Node, enable_telemetry, [Node]).
|
|
|
|
|
|
|
|
disable_telemetry() ->
|
|
disable_telemetry() ->
|
|
|
- [disable_telemetry(Node) || Node <- ekka_mnesia:running_nodes()], ok.
|
|
|
|
|
|
|
+ lists:foreach(fun disable_telemetry/1,ekka_mnesia:running_nodes()).
|
|
|
|
|
|
|
|
disable_telemetry(Node) when Node =:= node() ->
|
|
disable_telemetry(Node) when Node =:= node() ->
|
|
|
emqx_telemetry:disable();
|
|
emqx_telemetry:disable();
|