http: connection: unify adapter configuration and defaults

This commit is contained in:
William Pitcock 2019-03-08 22:59:10 +00:00
parent ba48bd901c
commit 1f78d23eed
1 changed files with 5 additions and 1 deletions

View File

@ -31,6 +31,10 @@ def new(opts \\ []) do
# #
defp hackney_options(opts) do defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, []) 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
end end