X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=c0173465ab741d9bf39b41750865cdbe7f30c3e7;hb=99f50bf3e8d3077216eecd101f16c31f46fdbf42;hp=cc2e96e2b28302fc36af84ddc261a8567fddbbc4;hpb=50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8;p=akkoma

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index cc2e96e2b..c0173465a 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -8,8 +8,8 @@ defmodule Pleroma.HTTP.Connection do
   """
 
   @hackney_options [
-    timeout: 10000,
-    recv_timeout: 20000,
+    connect_timeout: 2_000,
+    recv_timeout: 20_000,
     follow_redirect: true,
     pool: :federation
   ]
@@ -31,6 +31,10 @@ defmodule Pleroma.HTTP.Connection do
   #
   defp hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
-    Keyword.merge(@hackney_options, options)
+    adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+    @hackney_options
+    |> Keyword.merge(adapter_options)
+    |> Keyword.merge(options)
   end
 end