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

feat(rules): support function outputs

This commit is contained in:
Shawn 2021-09-25 20:46:01 +08:00
parent bd081913b5
commit d4f20c82e0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/emqx_rule_engine/src/emqx_rule_runtime.erl
View File

@ -240,13 +240,21 @@ handle_output(OutId, Selected, Envs) ->
do_handle_output(<<"bridge:", _/binary>> = _ChannelId, _Selected, _Envs) -> do_handle_output(<<"bridge:", _/binary>> = _ChannelId, _Selected, _Envs) ->
?LOG(warning, "calling bridge from rules has not been implemented yet!"); ?LOG(warning, "calling bridge from rules has not been implemented yet!");
do_handle_output(OutputFun, Selected, Envs) when is_function(OutputFun) ->
do_handle_output(BuiltInOutput, Selected, Envs) -> erlang:apply(OutputFun, [Selected, Envs]);
try binary_to_existing_atom(BuiltInOutput) of Func -> do_handle_output(BuiltInOutput, Selected, Envs) when is_atom(BuiltInOutput) ->
erlang:apply(emqx_rule_outputs, Func, [Selected, Envs]) handle_builtin_output(BuiltInOutput, Selected, Envs);
do_handle_output(BuiltInOutput, Selected, Envs) when is_binary(BuiltInOutput) ->
try binary_to_existing_atom(BuiltInOutput) of
Func -> handle_builtin_output(Func, Selected, Envs)
catch catch
error:badarg -> error(not_found); error:badarg -> error(not_found)
error:undef -> error(not_found) end.
handle_builtin_output(Func, Selected, Envs) ->
case erlang:function_exported(emqx_rule_outputs, Func, 2) of
true -> erlang:apply(emqx_rule_outputs, Func, [Selected, Envs]);
false -> error(not_found)
end. end.
eval({path, [{key, <<"payload">>} | Path]}, #{payload := Payload}) -> eval({path, [{key, <<"payload">>} | Path]}, #{payload := Payload}) ->

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

@ -55,7 +55,7 @@ test_rule(Sql, Select, Context, EventTopics) ->
info = #{ info = #{
sql => Sql, sql => Sql,
from => EventTopics, from => EventTopics,
outputs => [<<"get_selected_data">>], outputs => [get_selected_data],
enabled => true, enabled => true,
is_foreach => emqx_rule_sqlparser:select_is_foreach(Select), is_foreach => emqx_rule_sqlparser:select_is_foreach(Select),
fields => emqx_rule_sqlparser:select_fields(Select), fields => emqx_rule_sqlparser:select_fields(Select),