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

fix(rule): better func name for emqx_rule_utils

This commit is contained in:
DDDHuang 2022-06-13 10:53:36 +08:00
parent c5f754c3b8
commit 1e02656035
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,7 @@ to_qos(TargetQoS) ->
get_qos(-1, _Data, Default) -> Default; get_qos(-1, _Data, Default) -> Default;
get_qos(TargetQoS, Data, _Default) -> get_qos(TargetQoS, Data, _Default) ->
qos(emqx_rule_utils:replace_simple_var(TargetQoS, Data)). qos(emqx_rule_utils:replace_var(TargetQoS, Data)).
qos(<<"0">>) -> 0; qos(<<"0">>) -> 0;
qos(<<"1">>) -> 1; qos(<<"1">>) -> 1;
@ -285,7 +285,7 @@ to_retain(TargetRetain) ->
end. end.
get_retain(TargetRetain, Data) -> get_retain(TargetRetain, Data) ->
retain(emqx_rule_utils:replace_simple_var(TargetRetain, Data)). retain(emqx_rule_utils:replace_var(TargetRetain, Data)).
retain(true) -> true; retain(true) -> true;
retain(false) -> false; retain(false) -> false;

19
apps/emqx_rule_engine/src/emqx_rule_utils.erl
View File

@ -16,8 +16,7 @@
-module(emqx_rule_utils). -module(emqx_rule_utils).
-export([ replace_vars_in_str/2 -export([ replace_var/2
, replace_simple_var/2
]). ]).
%% preprocess and process tempalte string with place holders %% preprocess and process tempalte string with place holders
@ -91,20 +90,12 @@ preproc_tmpl([[Str, Phld]| Tokens], Acc) ->
preproc_tmpl([[Str]| Tokens], Acc) -> preproc_tmpl([[Str]| Tokens], Acc) ->
preproc_tmpl(Tokens, put_head(str, Str, Acc)). preproc_tmpl(Tokens, put_head(str, Str, Acc)).
%% Replace a string contains vars to another string in which the placeholders are replace by the
%% corresponding values. For example, given "a: ${var}", if the var=1, the result string will be:
%% "a: 1".
replace_vars_in_str(Tokens, Data) when is_list(Tokens) ->
proc_tmpl(Tokens, Data, #{return => full_binary});
replace_vars_in_str(Val, _Data) ->
Val.
%% Replace a simple var to its value. For example, given "${var}", if the var=1, then the result %% Replace a simple var to its value. For example, given "${var}", if the var=1, then the result
%% value will be an integer 1. %% value will be an integer 1.
replace_simple_var(Tokens, Data) when is_list(Tokens) -> replace_var(Tokens, Data) when is_list(Tokens) ->
[Var] = proc_tmpl(Tokens, Data, #{return => rawlist}), [Val] = proc_tmpl(Tokens, Data, #{return => rawlist}),
Var; Val;
replace_simple_var(Val, _Data) -> replace_var(Val, _Data) ->
Val. Val.
put_head(_Type, <<>>, List) -> List; put_head(_Type, <<>>, List) -> List;