diff options
| author | feld <feld@feld.me> | 2024-02-09 16:48:05 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-09 16:48:05 +0000 |
| commit | 991807080bfb35caf32f2403d61dd6ced66a9a50 (patch) | |
| tree | 29a00be925b6f08c0bd1cd0b75636674b7eb7dec /lib | |
| parent | 72480e7b2fc19beaa8a0a524e8b1c83442debd01 (diff) | |
| parent | 0eca3e38ebd6c5b1e7135275959d984af7acfd26 (diff) | |
| download | pleroma-991807080bfb35caf32f2403d61dd6ced66a9a50.tar.gz pleroma-991807080bfb35caf32f2403d61dd6ced66a9a50.zip | |
Merge branch 'gun-fix' into 'develop'
Fix Gun connection supervisor logic error
See merge request pleroma/pleroma!4056
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/gun/connection_pool/worker_supervisor.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/gun/connection_pool/worker_supervisor.ex b/lib/pleroma/gun/connection_pool/worker_supervisor.ex index b2be4ff87..24ad61117 100644 --- a/lib/pleroma/gun/connection_pool/worker_supervisor.ex +++ b/lib/pleroma/gun/connection_pool/worker_supervisor.ex @@ -21,7 +21,9 @@ defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do def start_worker(opts, retry \\ false) do case DynamicSupervisor.start_child(__MODULE__, {Pleroma.Gun.ConnectionPool.Worker, opts}) do {:error, :max_children} -> - if Enum.any?([retry, free_pool()], &match?(&1, :error)) do + funs = [fn -> !retry end, fn -> match?(:error, free_pool()) end] + + if Enum.any?(funs, fn fun -> fun.() end) do :telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts}) {:error, :pool_full} else |