From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Fri, 6 Mar 2020 18:24:19 +0000 (+0300)
Subject: little polishing
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=78282dc9839dbd17c4649cd3936bb8f4c8283745;p=akkoma

little polishing
---

diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index 9b03f4653..862e851c0 100644
--- a/lib/pleroma/http/adapter_helper/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -5,11 +5,11 @@
 defmodule Pleroma.HTTP.AdapterHelper.Gun do
   @behaviour Pleroma.HTTP.AdapterHelper
 
-  require Logger
-
   alias Pleroma.HTTP.AdapterHelper
   alias Pleroma.Pool.Connections
 
+  require Logger
+
   @defaults [
     connect_timeout: 5_000,
     domain_lookup_timeout: 5_000,
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex
index a0e161eaa..d08afae0c 100644
--- a/lib/pleroma/http/adapter_helper/hackney.ex
+++ b/lib/pleroma/http/adapter_helper/hackney.ex
@@ -13,8 +13,10 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
   def options(connection_opts \\ [], %URI{} = uri) do
     proxy = Pleroma.Config.get([:http, :proxy_url], nil)
 
+    config_opts = Pleroma.Config.get([:http, :adapter], [])
+
     @defaults
-    |> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
+    |> Keyword.merge(config_opts)
     |> Keyword.merge(connection_opts)
     |> add_scheme_opts(uri)
     |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 97eec88c1..777e5d4c8 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -6,6 +6,14 @@ defmodule Pleroma.HTTP.Connection do
   @moduledoc """
   Configure Tesla.Client with default and customized adapter options.
   """
+
+  alias Pleroma.Config
+  alias Pleroma.HTTP.AdapterHelper
+
+  require Logger
+
+  @defaults [pool: :federation]
+
   @type ip_address :: ipv4_address() | ipv6_address()
   @type ipv4_address :: {0..255, 0..255, 0..255, 0..255}
   @type ipv6_address ::
@@ -13,13 +21,6 @@ defmodule Pleroma.HTTP.Connection do
   @type proxy_type() :: :socks4 | :socks5
   @type host() :: charlist() | ip_address()
 
-  @defaults [pool: :federation]
-
-  require Logger
-
-  alias Pleroma.Config
-  alias Pleroma.HTTP.AdapterHelper
-
   @doc """
   Merge default connection & adapter options with received ones.
   """
diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex
index f96c08f21..7529e9240 100644
--- a/lib/pleroma/pool/connections.ex
+++ b/lib/pleroma/pool/connections.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Pool.Connections do
   use GenServer
 
   alias Pleroma.Config
+  alias Pleroma.Gun
 
   require Logger
 
@@ -19,8 +20,6 @@ defmodule Pleroma.Pool.Connections do
 
   defstruct conns: %{}, opts: []
 
-  alias Pleroma.Gun
-
   @spec start_link({atom(), keyword()}) :: {:ok, pid()}
   def start_link({name, opts}) do
     GenServer.start_link(__MODULE__, opts, name: name)