From 2a2a00e0ad34b2d30387538e2f4d3dce640af5ab Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Tue, 11 Jan 2022 14:44:08 +0800 Subject: [PATCH] fix(rule): remove rules from all nodes in the cluster --- apps/emqx_rule_engine/src/emqx_rule_engine.erl | 2 +- apps/emqx_rule_engine/src/emqx_rule_engine_api.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/apps/emqx_rule_engine/src/emqx_rule_engine.erl index 8749fea13..60befa3ab 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl @@ -119,7 +119,7 @@ post_config_update(_, _Req, NewRules, OldRules, _AppEnvs) -> load_rules() -> maps_foreach(fun({Id, Rule}) -> {ok, _} = create_rule(Rule#{id => bin(Id)}) - end, emqx_conf:get([rule_engine, rules], #{})). + end, emqx:get_config([rule_engine, rules], #{})). -spec create_rule(map()) -> {ok, rule()} | {error, term()}. create_rule(Params = #{id := RuleId}) when is_binary(RuleId) -> diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl index b983747e9..6f1da4e88 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl @@ -246,7 +246,7 @@ param_path_id() -> '/rules/:id'(delete, #{bindings := #{id := Id}}) -> ConfPath = emqx_rule_engine:config_key_path() ++ [Id], - case emqx:remove_config(ConfPath, #{}) of + case emqx_conf:remove(ConfPath, #{}) of {ok, _} -> {204}; {error, Reason} -> ?SLOG(error, #{msg => "delete_rule_failed",