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

Merge pull request #10202 from keynslug/fix/EMQX-9269/bridge-list 

fix(bridge-api): unflatten nodes' bridge lists back
This commit is contained in:
Andrew Mayorov 2023-03-22 12:54:45 +03:00 committed by GitHub
parent 33606fa14c af7b2215ca
commit 356be81aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 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

@ -56,8 +56,8 @@
-define(BRIDGE_NOT_FOUND(BridgeType, BridgeName), -define(BRIDGE_NOT_FOUND(BridgeType, BridgeName),
?NOT_FOUND( ?NOT_FOUND(
<<"Bridge lookup failed: bridge named '", BridgeName/binary, "' of type ", <<"Bridge lookup failed: bridge named '", (BridgeName)/binary, "' of type ",
(atom_to_binary(BridgeType))/binary, " does not exist.">> (bin(BridgeType))/binary, " does not exist.">>
) )
). ).
@ -475,10 +475,10 @@ schema("/bridges_probe") ->
case is_ok(NodeReplies) of case is_ok(NodeReplies) of
{ok, NodeBridges} -> {ok, NodeBridges} ->
AllBridges = [ AllBridges = [
format_resource(Data, Node) [format_resource(Data, Node) || Data <- Bridges]
|| {Node, Bridges} <- lists:zip(Nodes, NodeBridges), Data <- Bridges || {Node, Bridges} <- lists:zip(Nodes, NodeBridges)
], ],
{200, zip_bridges([AllBridges])}; {200, zip_bridges(AllBridges)};
{error, Reason} -> {error, Reason} ->
{500, error_msg('INTERNAL_ERROR', Reason)} {500, error_msg('INTERNAL_ERROR', Reason)}
end. end.