Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Timeout db queries in 10 seconds instead of 5
Uku Taht08afc2ae71fc
diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.exindex 0610082537..1880c62782 100644--- a/lib/plausible/stats/aggregate.ex+++ b/lib/plausible/stats/aggregate.ex@@ -19,9 +19,9 @@ defmodule Plausible.Stats.Aggregate doTask.async(fn -> %{} end)end- Task.await(session_task)- |> Map.merge(Task.await(event_task))- |> Map.merge(Task.await(time_on_page_task))+ Task.await(session_task, 10_000)+ |> Map.merge(Task.await(event_task, 10_000))+ |> Map.merge(Task.await(time_on_page_task, 10_000))|> Enum.map(fn {metric, value} ->{metric, %{"value" => round(value || 0)}}end)diff --git a/lib/plausible/stats/timeseries.ex b/lib/plausible/stats/timeseries.exindex 4647cf6c9f..253598b03d 100644--- a/lib/plausible/stats/timeseries.ex+++ b/lib/plausible/stats/timeseries.ex@@ -13,10 +13,13 @@ defmodule Plausible.Stats.Timeseries dosession_metrics = Enum.filter(metrics, &(&1 in @session_metrics))[event_result, session_result] =- Task.await_many([- Task.async(fn -> events_timeseries(site, query, event_metrics) end),- Task.async(fn -> sessions_timeseries(site, query, session_metrics) end)- ])+ Task.await_many(+ [+ Task.async(fn -> events_timeseries(site, query, event_metrics) end),+ Task.async(fn -> sessions_timeseries(site, query, session_metrics) end)+ ],+ 10_000+ )Enum.map(steps, fn step ->empty_row(step, metrics)diff --git a/lib/plausible_web/controllers/api/external_stats_controller.ex b/lib/plausible_web/controllers/api/external_stats_controller.exindex 2c3b7aa8c9..1aa63bb8e1 100644--- a/lib/plausible_web/controllers/api/external_stats_controller.ex+++ b/lib/plausible_web/controllers/api/external_stats_controller.ex@@ -23,10 +23,13 @@ defmodule PlausibleWeb.Api.ExternalStatsController doprev_query = Query.shift_back(query, site)[prev_result, curr_result] =- Task.await_many([- Task.async(fn -> Plausible.Stats.aggregate(site, prev_query, metrics) end),- Task.async(fn -> Plausible.Stats.aggregate(site, query, metrics) end)- ])+ Task.await_many(+ [+ Task.async(fn -> Plausible.Stats.aggregate(site, prev_query, metrics) end),+ Task.async(fn -> Plausible.Stats.aggregate(site, query, metrics) end)+ ],+ 10_000+ )Enum.map(curr_result, fn {metric, %{"value" => current_val}} ->%{"value" => prev_val} = prev_result[metric]