more clean up

This commit is contained in:
Alexander Strizhakov 2020-03-13 09:37:57 +03:00
commit 98ed0d1c4b
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
7 changed files with 21 additions and 22 deletions

View file

@ -22,7 +22,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
@spec options(keyword(), URI.t()) :: keyword()
def options(incoming_opts \\ [], %URI{} = uri) do
proxy =
Pleroma.Config.get([:http, :proxy_url], nil)
Pleroma.Config.get([:http, :proxy_url])
|> AdapterHelper.format_proxy()
config_opts = Pleroma.Config.get([:http, :adapter], [])

View file

@ -11,7 +11,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
@spec options(keyword(), URI.t()) :: keyword()
def options(connection_opts \\ [], %URI{} = uri) do
proxy = Pleroma.Config.get([:http, :proxy_url], nil)
proxy = Pleroma.Config.get([:http, :proxy_url])
config_opts = Pleroma.Config.get([:http, :adapter], [])

View file

@ -30,12 +30,12 @@ defmodule Pleroma.HTTP.Connection do
@defaults
|> pool_timeout()
|> Keyword.merge(opts)
|> adapter().options(uri)
|> adapter_helper().options(uri)
end
defp pool_timeout(opts) do
{config_key, default} =
if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
if adapter() == Tesla.Adapter.Gun do
{:pools, Config.get([:pools, :default, :timeout])}
else
{:hackney_pools, 10_000}
@ -47,10 +47,12 @@ defmodule Pleroma.HTTP.Connection do
end
@spec after_request(keyword()) :: :ok
def after_request(opts), do: adapter().after_request(opts)
def after_request(opts), do: adapter_helper().after_request(opts)
defp adapter do
case Application.get_env(:tesla, :adapter) do
defp adapter, do: Application.get_env(:tesla, :adapter)
defp adapter_helper do
case adapter() do
Tesla.Adapter.Gun -> AdapterHelper.Gun
Tesla.Adapter.Hackney -> AdapterHelper.Hackney
_ -> AdapterHelper