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

Merge pull request #10260 from thalesmg/minor-refactor-basic-usage-rule-rv50 

refactor(rule_engine): use more helper functions
This commit is contained in:
Thales Macedo Garitezi 2023-03-29 09:44:23 -03:00 committed by GitHub
parent 11c120f87c d126c7dc62
commit 5089449203
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,14 +319,8 @@ get_basic_usage_info() ->
ReferencedBridges = ReferencedBridges =
lists:foldl( lists:foldl(
fun(#{actions := Actions, from := Froms}, Acc) -> fun(#{actions := Actions, from := Froms}, Acc) ->
BridgeIDs0 = BridgeIDs0 = get_referenced_hookpoints(Froms),
[ BridgeIDs1 = get_egress_bridges(Actions),
BridgeID
|| From <- Froms,
{ok, BridgeID} <-
[emqx_bridge_resource:bridge_hookpoint_to_bridge_id(From)]
],
BridgeIDs1 = lists:filter(fun is_binary/1, Actions),
tally_referenced_bridges(BridgeIDs0 ++ BridgeIDs1, Acc) tally_referenced_bridges(BridgeIDs0 ++ BridgeIDs1, Acc)
end, end,
#{}, #{},
@ -490,10 +484,8 @@ forwards_to_bridge(Actions, BridgeId) ->
lists:any(fun(A) -> A =:= BridgeId end, Actions). lists:any(fun(A) -> A =:= BridgeId end, Actions).
references_ingress_bridge(Froms, BridgeId) -> references_ingress_bridge(Froms, BridgeId) ->
lists:any( lists:member(
fun(ReferenceBridgeId) -> BridgeId,
BridgeId =:= ReferenceBridgeId
end,
[ [
RefBridgeId RefBridgeId
|| From <- Froms, || From <- Froms,
@ -501,3 +493,14 @@ references_ingress_bridge(Froms, BridgeId) ->
[emqx_bridge_resource:bridge_hookpoint_to_bridge_id(From)] [emqx_bridge_resource:bridge_hookpoint_to_bridge_id(From)]
] ]
). ).
get_referenced_hookpoints(Froms) ->
[
BridgeID
|| From <- Froms,
{ok, BridgeID} <-
[emqx_bridge_resource:bridge_hookpoint_to_bridge_id(From)]
].
get_egress_bridges(Actions) ->
lists:filter(fun is_binary/1, Actions).