retry and retry_timeout settings default change

diff --git a/config/config.exs b/config/config.exs
index 661dfad20195105e15d570e6364308b8bc1298be..f0dab24b5d1a10d3198bcb98b495eae00c4c48a9 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -609,8 +609,8 @@ config :pleroma, Pleroma.Repo,
 config :pleroma, :connections_pool,
   checkin_timeout: 250,
   max_connections: 250,
-  retry: 0,
-  retry_timeout: 100,
+  retry: 1,
+  retry_timeout: 1000,
   await_up_timeout: 5_000
 
 config :pleroma, :pools,

diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index ef3cc40e67e23d0c4bd6888ec3c0d53bf0dbc854..a39a7436dc932631965974ca0582aae6623f08ab 100644 (file)
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -406,8 +406,8 @@ It will increase memory usage, but federation would work faster.
 
 * `:checkin_timeout` - timeout to checkin connection from pool. Default: 250ms.
 * `:max_connections` - maximum number of connections in the pool. Default: 250 connections.
-* `:retry` - number of retries, while `gun` will try to reconnect if connections goes down. Default: 5.
-* `:retry_timeout` - timeout while `gun` will try to reconnect. Default: 100ms.
+* `:retry` - number of retries, while `gun` will try to reconnect if connections goes down. Default: 1.
+* `:retry_timeout` - timeout while `gun` will try to reconnect. Default: 1000ms.
 * `:await_up_timeout` - timeout while `gun` will wait until connection is up. Default: 5000ms.
 
 ### :pools

diff --git a/lib/pleroma/gun/conn.ex b/lib/pleroma/gun/conn.ex
index 9ae41909227b65635cd3bba3ba31b05c7431f4a1..d73bec3605e8cae262d1922f620e4b87ea5fe74a 100644 (file)
--- a/lib/pleroma/gun/conn.ex
+++ b/lib/pleroma/gun/conn.ex
@@ -42,8 +42,8 @@ defmodule Pleroma.Gun.Conn do
     opts =
       opts
       |> Enum.into(%{})
-      |> Map.put_new(:retry, pool_opts[:retry] || 0)
-      |> Map.put_new(:retry_timeout, pool_opts[:retry_timeout] || 100)
+      |> Map.put_new(:retry, pool_opts[:retry] || 1)
+      |> Map.put_new(:retry_timeout, pool_opts[:retry_timeout] || 1000)
       |> Map.put_new(:await_up_timeout, pool_opts[:await_up_timeout] || 5_000)
 
     key = "#{uri.scheme}:#{uri.host}:#{uri.port}"

diff --git a/lib/pleroma/http/adapter/gun.ex b/lib/pleroma/http/adapter/gun.ex
index 30c5c3c16f8e38f737d73d6044fe4d895b44d017..ecf9c5b62e56c47aa5d008ffd09f5697048592c8 100644 (file)
--- a/lib/pleroma/http/adapter/gun.ex
+++ b/lib/pleroma/http/adapter/gun.ex
@@ -15,7 +15,8 @@ defmodule Pleroma.HTTP.Adapter.Gun do
     connect_timeout: 5_000,
     domain_lookup_timeout: 5_000,
     tls_handshake_timeout: 5_000,
-    retry: 0,
+    retry: 1,
+    retry_timeout: 1000,
     await_up_timeout: 5_000
   ]
 

diff --git a/lib/pleroma/pool/connections.ex b/lib/pleroma/pool/connections.ex
index bde3ffd137c0fc2ba0bdc36c175b7a27040ad7ff..0f7a1bfd820f60359fbfcbf0ddb99db1b7f890cd 100644 (file)
--- a/lib/pleroma/pool/connections.ex
+++ b/lib/pleroma/pool/connections.ex
@@ -219,7 +219,7 @@ defmodule Pleroma.Pool.Connections do
 
   @impl true
   def handle_info({:gun_down, conn_pid, _protocol, _reason, _killed}, state) do
-    retries = Config.get([:connections_pool, :retry], 0)
+    retries = Config.get([:connections_pool, :retry], 1)
     # we can't get info on this pid, because pid is dead
     state =
       with {key, conn} <- find_conn(state.conns, conn_pid),