RecycledCloud/ha-handler
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

haproxy: fix mixing/invalid merging of stat entries

Browse source
This commit is contained in:
Timothée Floure 2022-02-21 10:42:03 +01:00
parent 7a7fcd8e31
commit 9ddd999ed8
Signed by: tfloure
GPG key ID: 4502C902C00A1E12
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ha_handler/ha_proxy.ex
View file

@ -40,11 +40,12 @@ defmodule HAHandler.HAProxy do
case mapping do case mapping do
%{ %{
"id" => id, "id" => id,
"proxyId" => proxy_id,
"objType" => type, "objType" => type,
"field" => %{"name" => name}, "field" => %{"name" => name},
"value" => %{"value" => value}, "value" => %{"value" => value},
} -> } ->
%{:id => id, :type => type, :field => name, :value => value} %{:id => id, :proxy_id => proxy_id, :type => type, :field => name, :value => value}
_ -> _ ->
nil nil
end end
@ -54,15 +55,16 @@ defmodule HAHandler.HAProxy do
extracted extracted
|> List.flatten() |> List.flatten()
|> Enum.group_by( |> Enum.group_by(
fn mapping -> {mapping.type, mapping.id} end, fn mapping -> {mapping.type, mapping.id, mapping.proxy_id} end,
fn mapping -> %{mapping.field => mapping.value} end fn mapping -> %{mapping.field => mapping.value} end
) )
|> Enum.map( |> Enum.map(
fn {{type, id}, grouped_mappings} -> fn {{type, id, proxy_id}, grouped_mappings} ->
grouped_mappings grouped_mappings
|> Enum.reduce(fn l, r -> Map.merge(l,r) end) |> Enum.reduce(fn l, r -> Map.merge(l,r) end)
|> Map.put("type", type) |> Map.put("type", type)
|> Map.put("id", id) |> Map.put("id", id)
|> Map.put("proxy_id", proxy_id)
end end
) )
|> Enum.group_by( |> Enum.group_by(