Просмотр исходного кода

Merge pull request #7813 from DDDHuang/bridge_api_bad_format

fix: bridge api response bad node name format
zhongwencool 3 лет назад
Родитель
Сommit
c7241f2abc
1 измененных файлов с 14 добавлено и 8 удалено
  1. 14 8
      apps/emqx_bridge/src/emqx_bridge_api.erl

+ 14 - 8
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,23 @@ aggregate_metrics(AllMetrics) ->
         AllMetrics
     ).
 
-format_resp(#{
-    type := Type,
-    name := BridgeName,
-    raw_config := RawConf,
-    resource_data := #{status := Status, metrics := Metrics}
-}) ->
+format_resp(Data) ->
+    format_resp(Data, node()).
+
+format_resp(
+    #{
+        type := Type,
+        name := BridgeName,
+        raw_config := RawConf,
+        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)
     }.