Skip to content

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

Allow to configure Finch pools (#4270)

ruslandoga922b9ab4d61a
diff --git a/lib/plausible/application.ex b/lib/plausible/application.ex
index 01eec232d1..ebd1ef419f 100644
--- a/lib/plausible/application.ex
+++ b/lib/plausible/application.ex
@@ -135,35 +135,46 @@ defmodule Plausible.Application do
end
defp finch_pool_config() do
- base_config = %{
- "https://icons.duckduckgo.com" => [
- conn_opts: [transport_opts: [timeout: 15_000]]
- ]
- }
+ default = Application.get_env(:plausible, Plausible.Finch)
+
+ base_config =
+ if default do
+ %{default: default}
+ else
+ %{}
+ end
+
+ default_opts = default || []
base_config
- |> maybe_add_sentry_pool()
- |> maybe_add_paddle_pool()
- |> maybe_add_google_pools()
+ |> Map.put(
+ "https://icons.duckduckgo.com",
+ Config.Reader.merge(default_opts, conn_opts: [transport_opts: [timeout: 15_000]])
+ )
+ |> maybe_add_sentry_pool(default_opts)
+ |> maybe_add_paddle_pool(default_opts)
+ |> maybe_add_google_pools(default_opts)
end
- defp maybe_add_sentry_pool(pool_config) do
+ defp maybe_add_sentry_pool(pool_config, default) do
case Sentry.Config.dsn() do
{"http" <> _rest = url, _, _} ->
- Map.put(pool_config, url, size: 50)
+ Map.put(pool_config, url, Config.Reader.merge(default, size: 50))
nil ->
pool_config
end
end
- defp maybe_add_paddle_pool(pool_config) do
+ defp maybe_add_paddle_pool(pool_config, default) do
paddle_conf = Application.get_env(:plausible, :paddle)
cond do
paddle_conf[:vendor_id] && paddle_conf[:vendor_auth_code] ->
- Map.put(pool_config, Plausible.Billing.PaddleApi.vendors_domain(),
- conn_opts: [transport_opts: [timeout: 15_000]]
+ Map.put(
+ pool_config,
+ Plausible.Billing.PaddleApi.vendors_domain(),
+ Config.Reader.merge(default, conn_opts: [transport_opts: [timeout: 15_000]])
)
true ->
@@ -171,15 +182,19 @@ defmodule Plausible.Application do
end
end
- defp maybe_add_google_pools(pool_config) do
+ defp maybe_add_google_pools(pool_config, default) do
google_conf = Application.get_env(:plausible, :google)
cond do
google_conf[:client_id] && google_conf[:client_secret] ->
pool_config
- |> Map.put(google_conf[:api_url], conn_opts: [transport_opts: [timeout: 15_000]])
- |> Map.put(google_conf[:reporting_api_url],
- conn_opts: [transport_opts: [timeout: 15_000]]
+ |> Map.put(
+ google_conf[:api_url],
+ Config.Reader.merge(default, conn_opts: [transport_opts: [timeout: 15_000]])
+ )
+ |> Map.put(
+ google_conf[:reporting_api_url],
+ Config.Reader.merge(default, conn_opts: [transport_opts: [timeout: 15_000]])
)
true ->