Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Dont crash sites when ch 24 intervals unavailable (#5165)

hq1bfd7c4584256
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 3b6dc22d80..63c2890e22 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -5,6 +5,7 @@ defmodule PlausibleWeb.Live.Sites do
use PlausibleWeb, :live_view
import PlausibleWeb.Live.Components.Pagination
+ require Logger
alias Plausible.Sites
@@ -295,7 +296,7 @@ defmodule PlausibleWeb.Live.Sites do
"""
end
- attr(:hourly_stats, :map, required: true)
+ attr(:hourly_stats, :any, required: true)
def site_stats(assigns) do
~H"""
@@ -648,6 +649,13 @@ defmodule PlausibleWeb.Live.Sites do
{:noreply, socket}
end
+ defp loading(sites) do
+ sites.entries
+ |> Enum.into(%{}, fn site ->
+ {site.domain, :loading}
+ end)
+ end
+
defp load_sites(%{assigns: assigns} = socket) do
sites =
Sites.list_with_invitations(assigns.current_user, assigns.params,
@@ -657,12 +665,18 @@ defmodule PlausibleWeb.Live.Sites do
hourly_stats =
if connected?(socket) do
- Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites.entries)
+ try do
+ Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(sites.entries)
+ catch
+ kind, value ->
+ Logger.error(
+ "Could not render 24h visitors hourly intervals: #{inspect(kind)} #{inspect(value)}"
+ )
+
+ loading(sites)
+ end
else
- sites.entries
- |> Enum.into(%{}, fn site ->
- {site.domain, :loading}
- end)
+ loading(sites)
end
invitations = extract_invitations(sites.entries, assigns.current_team)