Merge branch 'develop' into gun

[akkoma] / lib / pleroma / http / connection.ex

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 85918341a31fc2722b3db5e4eef44a32d2cb815f..97eec88c1824dd995fe3717f2266a3ff7ab537de 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -1,5 +1,5 @@
 # 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
@@ -18,7 +18,7 @@ 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.
@@ -33,8 +33,14 @@ defmodule Pleroma.HTTP.Connection do
   end
 
   defp pool_timeout(opts) do
-    timeout =
-      Config.get([:pools, opts[:pool], :timeout]) || Config.get([:pools, :default, :timeout])
+    {config_key, default} =
+      if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Gun do
+        {:pools, Config.get([:pools, :default, :timeout])}
+      else
+        {:hackney_pools, 10_000}
+      end
+
+    timeout = Config.get([config_key, opts[:pool], :timeout], default)
 
     Keyword.merge(opts, timeout: timeout)
   end
@@ -44,9 +50,9 @@ defmodule Pleroma.HTTP.Connection do
 
   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
 
@@ -65,15 +71,15 @@ defmodule Pleroma.HTTP.Connection do
     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
 
@@ -83,7 +89,7 @@ defmodule Pleroma.HTTP.Connection do
     else
       _ ->
         Logger.warn("parsing proxy fail #{inspect(proxy)}")
-        {:error, :error_parsing_proxy}
+        {:error, :invalid_proxy}
     end
   end