Resolve merge conflicts

[akkoma] / lib / pleroma / http / connection.ex

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 35c1490da22813356d6ffc5a7086a79de9f04f24..a1460d3038af6bae452259f50e2972e4925e51f4 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.HTTP.Connection do
@@ -8,10 +8,10 @@ defmodule Pleroma.HTTP.Connection do
   """
 
   @hackney_options [
-    pool: :default,
-    timeout: 10000,
-    recv_timeout: 20000,
-    follow_redirect: true
+    connect_timeout: 10_000,
+    recv_timeout: 20_000,
+    follow_redirect: true,
+    pool: :federation
   ]
   @adapter Application.get_env(:tesla, :adapter)
 
@@ -29,8 +29,14 @@ defmodule Pleroma.HTTP.Connection do
 
   # fetch Hackney options
   #
-  defp hackney_options(opts) do
+  def hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
-    @hackney_options ++ options
+    adapter_options = Pleroma.Config.get([:http, :adapter], [])
+    proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
+
+    @hackney_options
+    |> Keyword.merge(adapter_options)
+    |> Keyword.merge(options)
+    |> Keyword.merge(proxy: proxy_url)
   end
 end