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

Delete resource failed when searching dependent rules (#4996)

This commit is contained in:
Shawn 2021-06-17 16:45:44 +08:00 committed by GitHub
parent 0ecaa80fb8
commit c0367fb8dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 8 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.2"}, % strict semver, bump manually! {vsn, "4.3.3"}, % 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]},

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

@ -1,21 +1,31 @@
%% -*-: erlang -*- %% -*-: erlang -*-
{"4.3.2", {"4.3.3",
[ {"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, []}
, {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.1", {"4.3.1",
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []} [ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
, {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]},
{"4.3.2",
[ {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ [
{"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, []}
, {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.1", {"4.3.1",
[ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []} [ {load_module, emqx_rule_engine, brutal_purge, soft_purge, []}
, {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]},
{"4.3.2",
[ {load_module, emqx_rule_registry, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}
] ]

7
apps/emqx_rule_engine/src/emqx_rule_registry.erl
View File

@ -392,8 +392,11 @@ find_rules_depends_on_resource(ResId) ->
end, [], get_rules()). end, [], get_rules()).
search_action_despends_on_resource(ResId, Actions) -> search_action_despends_on_resource(ResId, Actions) ->
lists:search(fun(#action_instance{args = #{<<"$resource">> := ResId0}}) -> lists:search(fun
ResId0 =:= ResId (#action_instance{args = #{<<"$resource">> := ResId0}}) ->
ResId0 =:= ResId;
(_) ->
false
end, Actions). end, Actions).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------