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

fix(rule): fix edit rule fail in the cluster

This commit is contained in:
Turtle 2021-09-14 13:53:41 +08:00 committed by turtleDeng
parent 4664b85968
commit 3ad0678892
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_rule_engine/src/emqx_rule_engine.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_rule_engine, {application, emqx_rule_engine,
[{description, "EMQ X Rule Engine"}, [{description, "EMQ X Rule Engine"},
{vsn, "4.3.4"}, % strict semver, bump manually! {vsn, "4.3.5"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_rule_engine_sup, emqx_rule_registry]}, {registered, [emqx_rule_engine_sup, emqx_rule_registry]},
{applications, [kernel,stdlib,rulesql,getopt]}, {applications, [kernel,stdlib,rulesql,getopt]},

8
apps/emqx_rule_engine/src/emqx_rule_engine.appup.src
View File

@ -1,5 +1,5 @@
%% -*-: erlang -*- %% -*-: erlang -*-
{"4.3.4", {"4.3.5",
[ {"4.3.0", [ {"4.3.0",
[ {load_module, emqx_rule_funcs, brutal_purge, soft_purge, []} [ {load_module, emqx_rule_funcs, brutal_purge, soft_purge, []}
, {load_module, emqx_rule_engine, brutal_purge, soft_purge, []} , {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
@ -23,6 +23,9 @@
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []} [ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
, {load_module, emqx_rule_actions, brutal_purge, soft_purge, []} , {load_module, emqx_rule_actions, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.4",
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ [
@ -49,6 +52,9 @@
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []} [ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
, {load_module, emqx_rule_actions, brutal_purge, soft_purge, []} , {load_module, emqx_rule_actions, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.4",
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
]},
{<<".*">>, []} {<<".*">>, []}
] ]
}. }.

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

@ -475,10 +475,10 @@ may_update_rule_params(Rule = #rule{enabled = OldEnb, actions = Actions, state =
Params = #{enabled := NewEnb}) -> Params = #{enabled := NewEnb}) ->
State = case {OldEnb, NewEnb} of State = case {OldEnb, NewEnb} of
{false, true} -> {false, true} ->
refresh_rule(Rule), _ = ?CLUSTER_CALL(refresh_rule, [Rule]),
force_changed; force_changed;
{true, false} -> {true, false} ->
clear_actions(Actions), _ = ?CLUSTER_CALL(clear_actions, [Actions]),
force_changed; force_changed;
_NoChange -> OldState _NoChange -> OldState
end, end,
@ -637,7 +637,7 @@ refresh_actions(Actions, Pred) ->
true -> true ->
{ok, #action{module = Mod, on_create = Create}} {ok, #action{module = Mod, on_create = Create}}
= emqx_rule_registry:find_action(ActName), = emqx_rule_registry:find_action(ActName),
_ = ?CLUSTER_CALL(init_action, [Mod, Create, Id, with_resource_params(Args)]), _ = init_action(Mod, Create, Id, with_resource_params(Args)),
refresh_actions(Fallbacks, Pred); refresh_actions(Fallbacks, Pred);
false -> ok false -> ok
end end