http: connection: unify adapter configuration and defaults

2019-03-08 22:59:10 +00:00 · 2019-03-08 22:59:10 +00:00 · 1f78d23eed
commit 1f78d23eed
parent ba48bd901c
1 changed files with 5 additions and 1 deletions
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@ -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