From b31a934a804aed3f35442ceafe2080b0955e7317 Mon Sep 17 00:00:00 2001
From: dcc <dcc@logografos.com>
Date: Wed, 15 May 2024 00:57:23 -0700
Subject:  total rebase

---
 lib/pleroma/gun/api.ex                               | 0
 lib/pleroma/gun/conn.ex                              | 6 +++---
 lib/pleroma/gun/connection_pool.ex                   | 0
 lib/pleroma/gun/connection_pool/reclaimer.ex         | 2 +-
 lib/pleroma/gun/connection_pool/worker.ex            | 0
 lib/pleroma/gun/connection_pool/worker_supervisor.ex | 6 ++++--
 6 files changed, 8 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 lib/pleroma/gun/api.ex
 mode change 100755 => 100644 lib/pleroma/gun/conn.ex
 mode change 100755 => 100644 lib/pleroma/gun/connection_pool.ex
 mode change 100755 => 100644 lib/pleroma/gun/connection_pool/reclaimer.ex
 mode change 100755 => 100644 lib/pleroma/gun/connection_pool/worker.ex
 mode change 100755 => 100644 lib/pleroma/gun/connection_pool/worker_supervisor.ex

(limited to 'lib/pleroma/gun')

diff --git a/lib/pleroma/gun/api.ex b/lib/pleroma/gun/api.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/gun/conn.ex b/lib/pleroma/gun/conn.ex
old mode 100755
new mode 100644
index 7c5785d..804cd11
--- a/lib/pleroma/gun/conn.ex
+++ b/lib/pleroma/gun/conn.ex
@@ -56,7 +56,7 @@ defmodule Pleroma.Gun.Conn do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 
@@ -90,7 +90,7 @@ defmodule Pleroma.Gun.Conn do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening socks proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 
@@ -106,7 +106,7 @@ defmodule Pleroma.Gun.Conn do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 
diff --git a/lib/pleroma/gun/connection_pool.ex b/lib/pleroma/gun/connection_pool.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/gun/connection_pool/reclaimer.ex b/lib/pleroma/gun/connection_pool/reclaimer.ex
old mode 100755
new mode 100644
index efd5c9f..35e7f4b
--- a/lib/pleroma/gun/connection_pool/reclaimer.ex
+++ b/lib/pleroma/gun/connection_pool/reclaimer.ex
@@ -9,7 +9,7 @@ defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
 
   def start_monitor do
     pid =
-      case :gen_server.start(__MODULE__, [], name: {:via, Registry, {registry(), "reclaimer"}}) do
+      case GenServer.start_link(__MODULE__, [], name: {:via, Registry, {registry(), "reclaimer"}}) do
         {:ok, pid} ->
           pid
 
diff --git a/lib/pleroma/gun/connection_pool/worker.ex b/lib/pleroma/gun/connection_pool/worker.ex
old mode 100755
new mode 100644
diff --git a/lib/pleroma/gun/connection_pool/worker_supervisor.ex b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
old mode 100755
new mode 100644
index d26a70b..eb83962
--- a/lib/pleroma/gun/connection_pool/worker_supervisor.ex
+++ b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
@@ -18,10 +18,12 @@ defmodule Pleroma.Gun.ConnectionPool.WorkerSupervisor do
     )
   end
 
-  def start_worker(opts, retry \\ false) do
+  def start_worker(opts, last_attempt \\ false) do
     case DynamicSupervisor.start_child(__MODULE__, {Pleroma.Gun.ConnectionPool.Worker, opts}) do
       {:error, :max_children} ->
-        if retry or free_pool() == :error do
+        funs = [fn -> last_attempt 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
-- 
cgit v1.2.3