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

Merge branch 'master' into improve_rule_bridge_apis

This commit is contained in:
Xinyu Liu 2022-03-08 11:38:42 +08:00 committed by GitHub
parent c5f92ef856 591d5f02d1
commit 558441eeb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,12 +399,12 @@ collect_status(Bridges) ->
[maps:with([node, status], B) || B <- Bridges]. [maps:with([node, status], B) || B <- Bridges].
aggregate_status(AllStatus) -> aggregate_status(AllStatus) ->
AllConnected = lists:all(fun (#{status := connected}) -> true; Head = fun ([A | _]) -> A end,
(_) -> false HeadVal = maps:get(status, Head(AllStatus), connecting),
end, AllStatus), AllRes = lists:all(fun (#{status := Val}) -> Val == HeadVal end, AllStatus),
case AllConnected of case AllRes of
true -> connected; true -> HeadVal;
false -> disconnected false -> inconsistent
end. end.
collect_metrics(Bridges) -> collect_metrics(Bridges) ->
@ -420,12 +420,11 @@ aggregate_metrics(AllMetrics) ->
format_resp(#{type := Type, name := BridgeName, raw_config := RawConf, format_resp(#{type := Type, name := BridgeName, raw_config := RawConf,
resource_data := #{status := Status, metrics := Metrics}}) -> resource_data := #{status := Status, metrics := Metrics}}) ->
IsConnected = fun(connected) -> connected; (_) -> disconnected end,
RawConf#{ RawConf#{
type => Type, type => Type,
name => maps:get(<<"name">>, RawConf, BridgeName), name => maps:get(<<"name">>, RawConf, BridgeName),
node => node(), node => node(),
status => IsConnected(Status), status => Status,
metrics => format_metrics(Metrics) metrics => format_metrics(Metrics)
}. }.