X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=c0173465ab741d9bf39b41750865cdbe7f30c3e7;hb=f358295cbe8f1d250e92dcc9265cdc83cb2cabdd;hp=1c31877688e5dfa3372629b2bd60d32e070d4042;hpb=980b5288ed119a3579afe632dff3391528ff399c;p=akkoma

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