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

fix: bridge api response bad node name format

This commit is contained in:
DDDHuang 2022-04-28 16:04:43 +08:00
parent c4787900cf
commit a26b0f79f2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_bridge/src/emqx_bridge_api.erl
View File

@ -392,7 +392,7 @@ schema("/nodes/:node/bridges/:id/operation/:operation") ->
'/bridges'(get, _Params) -> '/bridges'(get, _Params) ->
{200, {200,
zip_bridges([ 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() || Node <- mria_mnesia:running_nodes()
])}. ])}.
@ -619,17 +619,19 @@ aggregate_metrics(AllMetrics) ->
AllMetrics AllMetrics
). ).
format_resp(Data) ->
format_resp(Data, node()).
format_resp(#{ format_resp(#{
type := Type, type := Type,
name := BridgeName, name := BridgeName,
raw_config := RawConf, raw_config := RawConf,
resource_data := #{status := Status, metrics := Metrics} resource_data := #{status := Status, metrics := Metrics}}, Node) ->
}) ->
RawConfFull = fill_defaults(Type, RawConf), RawConfFull = fill_defaults(Type, RawConf),
RawConfFull#{ RawConfFull#{
type => Type, type => Type,
name => maps:get(<<"name">>, RawConf, BridgeName), name => maps:get(<<"name">>, RawConf, BridgeName),
node => node(), node => Node,
status => Status, status => Status,
metrics => format_metrics(Metrics) metrics => format_metrics(Metrics)
}. }.