moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/gun-pool-missing-cast' into 'develop' 

gun ConnectionPool: Re-add a missing cast for remove_client

See merge request pleroma/pleroma!2805
This commit is contained in:
rinpatch 2020-07-28 21:16:45 +00:00
parent f462f1c101 dab1d8c98e
commit 93dbba9b8a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ defp get_gun_pid_from_worker(worker_pid, register) do
# so instead we use cast + monitor # so instead we use cast + monitor
ref = Process.monitor(worker_pid) ref = Process.monitor(worker_pid)
if register, do: GenServer.cast(worker_pid, {:add_client, self(), true}) if register, do: GenServer.cast(worker_pid, {:add_client, self()})
receive do receive do
{:conn_pid, pid} -> {:conn_pid, pid} ->

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

@ -36,10 +36,18 @@ def handle_continue({:connect, [key, uri, opts, client_pid]}, _) do
end end
@impl true @impl true
def handle_cast({:add_client, client_pid, send}, state) do def handle_cast({:add_client, client_pid}, state) do
case handle_call(:add_client, {client_pid, nil}, state) do case handle_call(:add_client, {client_pid, nil}, state) do
{:reply, conn_pid, state, :hibernate} -> {:reply, conn_pid, state, :hibernate} ->
if send, do: send(client_pid, {:conn_pid, conn_pid}) send(client_pid, {:conn_pid, conn_pid})
{:noreply, state, :hibernate}
end
end
@impl true
def handle_cast({:remove_client, client_pid}, state) do
case handle_call(:remove_client, {client_pid, nil}, state) do
{:reply, _, state, :hibernate} ->
{:noreply, state, :hibernate} {:noreply, state, :hibernate}
end end
end end
@ -115,7 +123,7 @@ def handle_info({:DOWN, _ref, :process, pid, reason}, state) do
%{key: state.key} %{key: state.key}
) )
handle_cast({:remove_client, pid, false}, state) handle_cast({:remove_client, pid}, state)
end end
# LRFU policy: https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.1478 # LRFU policy: https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.1478