Timeout db queries in 10 seconds instead of 5

pull/1308/head
Uku Taht 5 years ago
parent 33ba5d79b6
commit 08afc2ae71

@ -19,9 +19,9 @@ defmodule Plausible.Stats.Aggregate do
Task.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)

@ -13,10 +13,13 @@ defmodule Plausible.Stats.Timeseries do
session_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)

@ -23,10 +23,13 @@ defmodule PlausibleWeb.Api.ExternalStatsController do
prev_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]

Loading…
Cancel
Save