|
|
@@ -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 |
|
|
|
|
|
|
|