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

fix(rule_engine): only auto re-enable the rule when it was force disabled

This commit is contained in:
Shawn 2021-04-26 22:50:06 +08:00 committed by turtleDeng
parent da81ab7988
commit 18688da0c1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_rule_engine/include/rule_engine.hrl
View File

@ -81,6 +81,7 @@
, enabled :: boolean() , enabled :: boolean()
, created_at :: integer() %% epoch in millisecond precision , created_at :: integer() %% epoch in millisecond precision
, description :: binary() , description :: binary()
, state = normal :: atom()
}). }).
-record(resource, -record(resource,

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

@ -180,7 +180,8 @@ create_rule(Params = #{rawsql := Sql, actions := ActArgs}) ->
actions = Actions, actions = Actions,
enabled = Enabled, enabled = Enabled,
created_at = erlang:system_time(millisecond), created_at = erlang:system_time(millisecond),
description = maps:get(description, Params, "") description = maps:get(description, Params, ""),
state = normal
}, },
ok = emqx_rule_registry:add_rule(Rule), ok = emqx_rule_registry:add_rule(Rule),
ok = emqx_rule_metrics:create_rule_metrics(RuleId), ok = emqx_rule_metrics:create_rule_metrics(RuleId),
@ -390,11 +391,11 @@ refresh_rules() ->
lists:foreach(fun(#rule{id = RuleId} = Rule) -> lists:foreach(fun(#rule{id = RuleId} = Rule) ->
try refresh_rule(Rule) try refresh_rule(Rule)
catch Error:Reason:ST -> catch Error:Reason:ST ->
emqx_rule_registry:add_rule(Rule#rule{enabled = false}), emqx_rule_registry:add_rule(Rule#rule{enabled = false, state = force_down}),
logger:critical( logger:error(
"Can not re-build rule ~p: ~0p. The rule is disabled." "Can not re-build rule ~s. The rule is force disabled. "
"Fix the issue and enable it manually.\n" "Fix the issue and enable it manually. "
"Stacktrace: ~0p", "Reason: ~0p, Stacktrace: ~0p",
[RuleId, {Error,Reason}, ST]) [RuleId, {Error,Reason}, ST])
end end
end, emqx_rule_registry:get_rules()). end, emqx_rule_registry:get_rules()).

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

@ -119,7 +119,7 @@ retry_loop(resource, ResId, Interval) ->
enable_rules_of_resource(ResId) -> enable_rules_of_resource(ResId) ->
lists:foreach( lists:foreach(
fun (#rule{enabled = false} = Rule) -> fun (#rule{enabled = false, state = force_down} = Rule) ->
emqx_rule_registry:add_rule(Rule#rule{enabled = true}); emqx_rule_registry:add_rule(Rule#rule{enabled = true});
(_) -> ok (_) -> ok
end, emqx_rule_registry:find_rules_depends_on_resource(ResId)). end, emqx_rule_registry:find_rules_depends_on_resource(ResId)).