From 6a0f2bdf8ceb4127678cc55406a02d41c7fb0ed7 Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Wed, 8 Jul 2020 13:01:02 +0200
Subject: [PATCH] Ensure connections error get known by the caller

---
 lib/pleroma/gun/connection_pool.ex        | 22 ++++++++++++----------
 lib/pleroma/gun/connection_pool/worker.ex |  3 ++-
 lib/pleroma/http/adapter_helper/gun.ex    |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
index e951872fe..d3eead7d8 100644
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Gun.ConnectionPool do
     case Registry.lookup(@registry, key) do
       # The key has already been registered, but connection is not up yet
       [{worker_pid, nil}] ->
-        get_gun_pid_from_worker(worker_pid)
+        get_gun_pid_from_worker(worker_pid, true)
 
       [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
         GenServer.cast(worker_pid, {:add_client, self(), false})
@@ -27,13 +27,11 @@ defmodule Pleroma.Gun.ConnectionPool do
         # so we open the connection in the process directly and send it's pid back
         # We trust gun to handle timeouts by itself
         case WorkerSupervisor.start_worker([key, uri, opts, self()]) do
-          {:ok, _worker_pid} ->
-            receive do
-              {:conn_pid, pid} -> {:ok, pid}
-            end
+          {:ok, worker_pid} ->
+            get_gun_pid_from_worker(worker_pid, false)
 
           {:error, {:already_started, worker_pid}} ->
-            get_gun_pid_from_worker(worker_pid)
+            get_gun_pid_from_worker(worker_pid, true)
 
           err ->
             err
@@ -41,17 +39,21 @@ defmodule Pleroma.Gun.ConnectionPool do
     end
   end
 
-  defp get_gun_pid_from_worker(worker_pid) do
+  defp get_gun_pid_from_worker(worker_pid, register) do
     # GenServer.call will block the process for timeout length if
     # the server crashes on startup (which will happen if gun fails to connect)
     # so instead we use cast + monitor
 
     ref = Process.monitor(worker_pid)
-    GenServer.cast(worker_pid, {:add_client, self(), true})
+    if register, do: GenServer.cast(worker_pid, {:add_client, self(), true})
 
     receive do
-      {:conn_pid, pid} -> {:ok, pid}
-      {:DOWN, ^ref, :process, ^worker_pid, reason} -> reason
+      {:conn_pid, pid} ->
+        Process.demonitor(ref)
+        {:ok, pid}
+
+      {:DOWN, ^ref, :process, ^worker_pid, reason} ->
+        {:error, reason}
     end
   end
 
diff --git a/lib/pleroma/gun/connection_pool/worker.ex b/lib/pleroma/gun/connection_pool/worker.ex
index 6ee622fb0..16a508ad9 100644
--- a/lib/pleroma/gun/connection_pool/worker.ex
+++ b/lib/pleroma/gun/connection_pool/worker.ex
@@ -30,7 +30,8 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
        %{key: key, timer: nil, client_monitors: %{client_pid => Process.monitor(client_pid)}},
        :hibernate}
     else
-      err -> {:stop, err}
+      err ->
+        {:stop, err, nil}
     end
   end
 
diff --git a/lib/pleroma/http/adapter_helper/gun.ex b/lib/pleroma/http/adapter_helper/gun.ex
index b8c4cc59c..74677ddb5 100644
--- a/lib/pleroma/http/adapter_helper/gun.ex
+++ b/lib/pleroma/http/adapter_helper/gun.ex
@@ -14,7 +14,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
     connect_timeout: 5_000,
     domain_lookup_timeout: 5_000,
     tls_handshake_timeout: 5_000,
-    retry: 1,
+    retry: 0,
     retry_timeout: 1000,
     await_up_timeout: 5_000
   ]
-- 
2.45.2