Commit 1f78d23e authored by kaniini's avatar kaniini
Browse files

http: connection: unify adapter configuration and defaults

parent ba48bd90
Pipeline #8778 passed with stages
in 3 minutes and 22 seconds
......@@ -31,6 +31,10 @@ def new(opts \\ []) 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment