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

fix: use concat replace flatten

This commit is contained in:
EMQ-YangM 2022-04-08 10:27:28 +08:00
parent 7606f55673
commit adf7d53ca5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,7 +323,7 @@ show_resource(#{id := Id}, _Params) ->
case emqx_rule_registry:find_resource(Id) of case emqx_rule_registry:find_resource(Id) of
{ok, R} -> {ok, R} ->
Status = Status =
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of [ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
{ok, St} -> [maps:put(node, Node, St)]; {ok, St} -> [maps:put(node, Node, St)];
@ -575,7 +575,7 @@ sort_by(Pos, TplList) ->
end, TplList). end, TplList).
get_rule_metrics(Id) -> get_rule_metrics(Id) ->
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of [ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
Res -> [maps:put(node, Node, Res)] Res -> [maps:put(node, Node, Res)]
@ -583,7 +583,7 @@ get_rule_metrics(Id) ->
|| Node <- ekka_mnesia:running_nodes()]). || Node <- ekka_mnesia:running_nodes()]).
get_action_metrics(Id) -> get_action_metrics(Id) ->
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of [ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
Res -> [maps:put(node, Node, Res)] Res -> [maps:put(node, Node, Res)]

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

@ -273,7 +273,7 @@ format(#resource{id = Id,
config = Config, config = Config,
description = Descr}) -> description = Descr}) ->
Status = Status =
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of [ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
{ok, St} -> [maps:put(node, Node, St)]; {ok, St} -> [maps:put(node, Node, St)];
@ -372,7 +372,7 @@ get_actions() ->
emqx_rule_registry:get_actions(). emqx_rule_registry:get_actions().
get_rule_metrics(Id) -> get_rule_metrics(Id) ->
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of [ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
Res -> [maps:put(node, Node, Res)] Res -> [maps:put(node, Node, Res)]
@ -380,7 +380,7 @@ get_rule_metrics(Id) ->
|| Node <- ekka_mnesia:running_nodes()]). || Node <- ekka_mnesia:running_nodes()]).
get_action_metrics(Id) -> get_action_metrics(Id) ->
lists:flatten( lists:concat(
[ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of [ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of
{badrpc, _} -> []; {badrpc, _} -> [];
Res -> [maps:put(node, Node, Res)] Res -> [maps:put(node, Node, Res)]