From 3057064a2a4cd6c896ca15ed64f0472e88e90bea Mon Sep 17 00:00:00 2001 From: Elin Olsson Date: Tue, 17 Dec 2024 01:51:38 +0100 Subject: [PATCH] Ignore empty metrics map in health report (#1694) Solves #1662. Also, the deprecated broadcast topic for health checks is replaced with the correct one. --- lib/nerves_hub/devices/metrics.ex | 2 ++ lib/nerves_hub_web/live/devices/device_health.ex | 2 +- lib/nerves_hub_web/live/devices/show.ex | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/nerves_hub/devices/metrics.ex b/lib/nerves_hub/devices/metrics.ex index ebd231167..a2053043b 100644 --- a/lib/nerves_hub/devices/metrics.ex +++ b/lib/nerves_hub/devices/metrics.ex @@ -148,6 +148,8 @@ defmodule NervesHub.Devices.Metrics do @doc """ Saves map of metrics. """ + def save_metrics(_device_id, metrics) when metrics == %{}, do: {:ok, 0} + def save_metrics(device_id, metrics) do entries = Enum.map(metrics, fn {key, val} -> diff --git a/lib/nerves_hub_web/live/devices/device_health.ex b/lib/nerves_hub_web/live/devices/device_health.ex index 3da2d736a..28480c40d 100644 --- a/lib/nerves_hub_web/live/devices/device_health.ex +++ b/lib/nerves_hub_web/live/devices/device_health.ex @@ -87,7 +87,7 @@ defmodule NervesHubWeb.Live.Devices.DeviceHealth do timer_ref = Process.send_after(self(), :check_health_interval, @check_health_interval) topic = "device:#{socket.assigns.device.id}:extensions" - NervesHubWeb.DeviceEndpoint.broadcast(topic, "health:check", %{}) + socket.endpoint.broadcast(topic, "health:check", %{}) socket |> assign(:health_check_timer, timer_ref) diff --git a/lib/nerves_hub_web/live/devices/show.ex b/lib/nerves_hub_web/live/devices/show.ex index e364470b7..501ad2d95 100644 --- a/lib/nerves_hub_web/live/devices/show.ex +++ b/lib/nerves_hub_web/live/devices/show.ex @@ -126,9 +126,12 @@ defmodule NervesHubWeb.Live.Devices.Show do def handle_info(:check_health_interval, socket) do timer_ref = Process.send_after(self(), :check_health_interval, 65_000) - socket.endpoint.broadcast("device:#{socket.assigns.device.id}", "check_health", %{}) + topic = "device:#{socket.assigns.device.id}:extensions" + socket.endpoint.broadcast(topic, "health:check", %{}) - {:noreply, assign(socket, :health_check_timer, timer_ref)} + socket + |> assign(:health_check_timer, timer_ref) + |> noreply() end def handle_info(%Broadcast{event: "location:updated"}, socket) do