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

fix(rule_engine): refresh rules and then re-enable it

This commit is contained in:
Shawn 2021-04-27 13:41:24 +08:00 committed by Rory Z
parent 6557b132a2
commit bea28d887c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_rule_engine/src/emqx_rule_engine.erl
View File

@ -470,10 +470,10 @@ may_update_rule_params(Rule = #rule{enabled = OldEnb, actions = Actions, state =
State = case {OldEnb, NewEnb} of State = case {OldEnb, NewEnb} of
{false, true} -> {false, true} ->
refresh_rule(Rule), refresh_rule(Rule),
force_enabled; force_changed;
{true, false} -> {true, false} ->
clear_actions(Actions), clear_actions(Actions),
force_disabled; force_changed;
_NoChange -> OldState _NoChange -> OldState
end, end,
may_update_rule_params(Rule#rule{enabled = NewEnb, state = State}, maps:remove(enabled, Params)); may_update_rule_params(Rule#rule{enabled = NewEnb, state = State}, maps:remove(enabled, Params));

10
apps/emqx_rule_engine/src/emqx_rule_monitor.erl
View File

@ -105,7 +105,7 @@ retry_loop(resource, ResId, Interval) ->
{ok, #resource_type{on_create = {M, F}}} = {ok, #resource_type{on_create = {M, F}}} =
emqx_rule_registry:find_resource_type(Type), emqx_rule_registry:find_resource_type(Type),
ok = emqx_rule_engine:init_resource(M, F, ResId, Config), ok = emqx_rule_engine:init_resource(M, F, ResId, Config),
enable_rules_of_resource(ResId) refresh_and_enable_rules_of_resource(ResId)
catch catch
Err:Reason:ST -> Err:Reason:ST ->
?LOG(warning, "init_resource failed: ~p, ~0p", ?LOG(warning, "init_resource failed: ~p, ~0p",
@ -117,9 +117,11 @@ retry_loop(resource, ResId, Interval) ->
ok ok
end. end.
enable_rules_of_resource(ResId) -> refresh_and_enable_rules_of_resource(ResId) ->
lists:foreach( lists:foreach(
fun (#rule{enabled = false, state = refresh_failed_at_bootup} = Rule) -> fun (#rule{id = Id, enabled = false, state = refresh_failed_at_bootup} = Rule) ->
emqx_rule_registry:add_rule(Rule#rule{enabled = true, state = normal}); emqx_rule_engine:refresh_rule(Rule),
emqx_rule_registry:add_rule(Rule#rule{enabled = true, state = normal}),
?LOG(info, "rule ~s is refreshed and re-enabled", [Id]);
(_) -> ok (_) -> ok
end, emqx_rule_registry:find_rules_depends_on_resource(ResId)). end, emqx_rule_registry:find_rules_depends_on_resource(ResId)).