squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure connections error get known by the caller

Browse Source
This commit is contained in:
href 2020-07-08 13:01:02 +02:00 committed by rinpatch
parent 46dd276d68
commit 6a0f2bdf8c
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/pleroma/gun/connection_pool.ex
View File

@ -16,7 +16,7 @@ defmodule Pleroma.Gun.ConnectionPool do
case Registry.lookup(@registry, key) do case Registry.lookup(@registry, key) do
# The key has already been registered, but connection is not up yet # The key has already been registered, but connection is not up yet
[{worker_pid, nil}] -> [{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}}] -> [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
GenServer.cast(worker_pid, {:add_client, self(), false}) 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 # so we open the connection in the process directly and send it's pid back
# We trust gun to handle timeouts by itself # We trust gun to handle timeouts by itself
case WorkerSupervisor.start_worker([key, uri, opts, self()]) do case WorkerSupervisor.start_worker([key, uri, opts, self()]) do
{:ok, _worker_pid} -> {:ok, worker_pid} ->
receive do get_gun_pid_from_worker(worker_pid, false)
{:conn_pid, pid} -> {:ok, pid}
end
{:error, {:already_started, worker_pid}} -> {:error, {:already_started, worker_pid}} ->
get_gun_pid_from_worker(worker_pid) get_gun_pid_from_worker(worker_pid, true)
err -> err ->
err err
@ -41,17 +39,21 @@ defmodule Pleroma.Gun.ConnectionPool do
end end
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 # GenServer.call will block the process for timeout length if
# the server crashes on startup (which will happen if gun fails to connect) # the server crashes on startup (which will happen if gun fails to connect)
# so instead we use cast + monitor # so instead we use cast + monitor
ref = Process.monitor(worker_pid) 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 receive do
{:conn_pid, pid} -> {:ok, pid} {:conn_pid, pid} ->
{:DOWN, ^ref, :process, ^worker_pid, reason} -> reason Process.demonitor(ref)
{:ok, pid}
{:DOWN, ^ref, :process, ^worker_pid, reason} ->
{:error, reason}
end end
end end

3
lib/pleroma/gun/connection_pool/worker.ex
View File

@ -30,7 +30,8 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
%{key: key, timer: nil, client_monitors: %{client_pid => Process.monitor(client_pid)}}, %{key: key, timer: nil, client_monitors: %{client_pid => Process.monitor(client_pid)}},
:hibernate} :hibernate}
else else
err -> {:stop, err} err ->
{:stop, err, nil}
end end
end end

2
lib/pleroma/http/adapter_helper/gun.ex
View File

@ -14,7 +14,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
connect_timeout: 5_000, connect_timeout: 5_000,
domain_lookup_timeout: 5_000, domain_lookup_timeout: 5_000,
tls_handshake_timeout: 5_000, tls_handshake_timeout: 5_000,
retry: 1, retry: 0,
retry_timeout: 1000, retry_timeout: 1000,
await_up_timeout: 5_000 await_up_timeout: 5_000
] ]