From a26b0f79f2f56f3bed27f53214d7e772cb223391 Mon Sep 17 00:00:00 2001 From: DDDHuang <44492639+DDDHuang@users.noreply.github.com> Date: Thu, 28 Apr 2022 16:04:43 +0800 Subject: [PATCH] fix: bridge api response bad node name format --- apps/emqx_bridge/src/emqx_bridge_api.erl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl index 9870830d0..18e41a5d6 100644 --- a/apps/emqx_bridge/src/emqx_bridge_api.erl +++ b/apps/emqx_bridge/src/emqx_bridge_api.erl @@ -392,7 +392,7 @@ schema("/nodes/:node/bridges/:id/operation/:operation") -> '/bridges'(get, _Params) -> {200, zip_bridges([ - [format_resp(Data) || Data <- emqx_bridge_proto_v1:list_bridges(Node)] + [format_resp(Data, Node) || Data <- emqx_bridge_proto_v1:list_bridges(Node)] || Node <- mria_mnesia:running_nodes() ])}. @@ -619,17 +619,19 @@ aggregate_metrics(AllMetrics) -> AllMetrics ). +format_resp(Data) -> + format_resp(Data, node()). + format_resp(#{ type := Type, name := BridgeName, raw_config := RawConf, - resource_data := #{status := Status, metrics := Metrics} -}) -> + resource_data := #{status := Status, metrics := Metrics}}, Node) -> RawConfFull = fill_defaults(Type, RawConf), RawConfFull#{ type => Type, name => maps:get(<<"name">>, RawConf, BridgeName), - node => node(), + node => Node, status => Status, metrics => format_metrics(Metrics) }.