From: rinpatch <rinpatch@sdf.org>
Date: Wed, 6 May 2020 18:41:34 +0000 (+0300)
Subject: Connection Pool: don't enforce pool limits if no new connection needs to be opened
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fffbcffb8c9ce1e96de5d1a5e15005e271deacd4;p=akkoma

Connection Pool: don't enforce pool limits if no new connection needs to be opened
---

diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
index e6abee69c..ed7ddff81 100644
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@@ -2,20 +2,20 @@ defmodule Pleroma.Gun.ConnectionPool do
   @registry __MODULE__
 
   def get_conn(uri, opts) do
-    case enforce_pool_limits() do
-      :ok ->
-        key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
+    key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
 
-        case Registry.lookup(@registry, key) do
-          # The key has already been registered, but connection is not up yet
-          [{worker_pid, {nil, _used_by, _crf, _last_reference}}] ->
-            get_gun_pid_from_worker(worker_pid)
+    case Registry.lookup(@registry, key) do
+      # The key has already been registered, but connection is not up yet
+      [{worker_pid, {nil, _used_by, _crf, _last_reference}}] ->
+        get_gun_pid_from_worker(worker_pid)
 
-          [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
-            GenServer.cast(worker_pid, {:add_client, self(), false})
-            {:ok, gun_pid}
+      [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
+        GenServer.cast(worker_pid, {:add_client, self(), false})
+        {:ok, gun_pid}
 
-          [] ->
+      [] ->
+        case enforce_pool_limits() do
+          :ok ->
             # :gun.set_owner fails in :connected state for whatevever reason,
             # so we open the connection in the process directly and send it's pid back
             # We trust gun to handle timeouts by itself
@@ -33,10 +33,10 @@ defmodule Pleroma.Gun.ConnectionPool do
               err ->
                 err
             end
-        end
 
-      :error ->
-        {:error, :pool_full}
+          :error ->
+            {:error, :pool_full}
+        end
     end
   end