X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fpool%2Fconnections.ex;h=4d4ba913c72fe4d9a2f1ca67de2f943716317e54;hb=b87b798ca1660224a3192c32b035c19b18e11587;hp=91102faf79840924e31abbf94882405f8f0aa296;hpb=f497cf2f7c21196c4d633ddf0d14f0a4ede00cea;p=akkoma

diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex
index 91102faf7..4d4ba913c 100644
--- a/lib/pleroma/pool/connections.ex
+++ b/lib/pleroma/pool/connections.ex
@@ -167,29 +167,20 @@ defmodule Pleroma.Pool.Connections do
     c1.crf <= c2.crf and c1.last_reference <= c2.last_reference
   end
 
-  defp find_conn_from_gun_info(conns, pid) do
-    # TODO: temp fix for gun MatchError https://github.com/ninenines/gun/issues/222
-    # TODO: REMOVE LATER
-    try do
-      %{origin_host: host, origin_scheme: scheme, origin_port: port} = Gun.info(pid)
-
-      host =
-        case :inet.ntoa(host) do
-          {:error, :einval} -> host
-          ip -> ip
-        end
-
-      key = "#{scheme}:#{host}:#{port}"
-      find_conn(conns, pid, key)
-    rescue
-      MatcheError -> find_conn(conns, pid)
-    end
-  end
-
   @impl true
   def handle_info({:gun_up, conn_pid, _protocol}, state) do
+    %{origin_host: host, origin_scheme: scheme, origin_port: port} = Gun.info(conn_pid)
+
+    host =
+      case :inet.ntoa(host) do
+        {:error, :einval} -> host
+        ip -> ip
+      end
+
+    key = "#{scheme}:#{host}:#{port}"
+
     state =
-      with {key, conn} <- find_conn_from_gun_info(state.conns, conn_pid),
+      with {key, conn} <- find_conn(state.conns, conn_pid, key),
            {true, key} <- {Process.alive?(conn_pid), key} do
         put_in(state.conns[key], %{
           conn