X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fpool%2Fconnections.ex;h=4d4ba913c72fe4d9a2f1ca67de2f943716317e54;hb=7f692343c80ddf353712490edfbcdb14866f5685;hp=16aa8054843dac9d63b84f48d152019d50480947;hpb=35471205f862fa069c6d87aefc1d827c9fab6e08;p=akkoma

diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex
index 16aa80548..4d4ba913c 100644
--- a/lib/pleroma/pool/connections.ex
+++ b/lib/pleroma/pool/connections.ex
@@ -169,26 +169,19 @@ defmodule Pleroma.Pool.Connections do
 
   @impl true
   def handle_info({:gun_up, conn_pid, _protocol}, state) do
-    # TODO: temp fix for gun MatchError https://github.com/ninenines/gun/issues/222
-    # TODO: REMOVE LATER
-    {key, conn} =
-      try 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}"
-        find_conn(state.conns, conn_pid, key)
-      rescue
-        MatcheError -> find_conn(state.conns, conn_pid)
+    %{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 {true, key} <- {Process.alive?(conn_pid), key} do
+      with {key, conn} <- find_conn(state.conns, conn_pid, key),
+           {true, key} <- {Process.alive?(conn_pid), key} do
         put_in(state.conns[key], %{
           conn
           | gun_state: :up,