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

Merge branch 'feat/connection-worker-monitor-flush' into 'develop' 

ConnectionPool Worker: use monitor flush instead of checking ref

See merge request pleroma/pleroma!3002
This commit is contained in:
rinpatch 2020-09-16 15:10:20 +00:00
parent eca8d26784 adb1b0282d
commit a4f80e1e74
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,12 +93,8 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
end) end)
{ref, state} = pop_in(state.client_monitors[client_pid]) {ref, state} = pop_in(state.client_monitors[client_pid])
# DOWN message can receive right after `remove_client` call and cause worker to terminate
state = Process.demonitor(ref, [:flush])
if is_nil(ref) do
state
else
Process.demonitor(ref)
timer = timer =
if used_by == [] do if used_by == [] do
@ -108,10 +104,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
nil nil
end end
%{state | timer: timer} {:reply, :ok, %{state | timer: timer}, :hibernate}
end
{:reply, :ok, state, :hibernate}
end end
@impl true @impl true