# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP.Connection do
require Logger
alias Pleroma.Config
- alias Pleroma.HTTP.Adapter
+ alias Pleroma.HTTP.AdapterHelper
@doc """
Merge default connection & adapter options with received ones.
defp adapter do
case Application.get_env(:tesla, :adapter) do
- Tesla.Adapter.Gun -> Adapter.Gun
- Tesla.Adapter.Hackney -> Adapter.Hackney
- _ -> Adapter
+ Tesla.Adapter.Gun -> AdapterHelper.Gun
+ Tesla.Adapter.Hackney -> AdapterHelper.Hackney
+ _ -> AdapterHelper
end
end
else
{_, _} ->
Logger.warn("parsing port in proxy fail #{inspect(proxy)}")
- {:error, :error_parsing_port_in_proxy}
+ {:error, :invalid_proxy_port}
:error ->
Logger.warn("parsing port in proxy fail #{inspect(proxy)}")
- {:error, :error_parsing_port_in_proxy}
+ {:error, :invalid_proxy_port}
_ ->
Logger.warn("parsing proxy fail #{inspect(proxy)}")
- {:error, :error_parsing_proxy}
+ {:error, :invalid_proxy}
end
end
else
_ ->
Logger.warn("parsing proxy fail #{inspect(proxy)}")
- {:error, :error_parsing_proxy}
+ {:error, :invalid_proxy}
end
end