aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhref <href@random.sh>2020-07-13 10:44:36 +0200
committerrinpatch <rinpatch@sdf.org>2020-07-15 15:26:35 +0300
commit6d583bcc3b23c0c16aefa3f34155e7e15b745b01 (patch)
treed184207868d9e1bbbb13229a856b611647562895
parente499275076422631b31f1455ab720aae9d7786d2 (diff)
downloadpleroma-6d583bcc3b23c0c16aefa3f34155e7e15b745b01.tar.gz
Set a default timeout for Gun adapter timeout
-rw-r--r--lib/pleroma/http/adapter_helper.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/http/adapter_helper.ex b/lib/pleroma/http/adapter_helper.ex
index 8ca433732..9ec3836b0 100644
--- a/lib/pleroma/http/adapter_helper.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@@ -44,15 +44,17 @@ defmodule Pleroma.HTTP.AdapterHelper do
@spec options(URI.t(), keyword()) :: keyword()
def options(%URI{} = uri, opts \\ []) do
@defaults
- |> pool_timeout()
+ |> put_timeout()
|> Keyword.merge(opts)
|> adapter_helper().options(uri)
end
- defp pool_timeout(opts) do
+ # For Hackney, this is the time a connection can stay idle in the pool.
+ # For Gun, this is the timeout to receive a message from Gun.
+ defp put_timeout(opts) do
{config_key, default} =
if adapter() == Tesla.Adapter.Gun do
- {:pools, Config.get([:pools, :default, :timeout])}
+ {:pools, Config.get([:pools, :default, :timeout], 5_000)}
else
{:hackney_pools, 10_000}
end