Merge remote-tracking branch 'origin/develop' into oban/backup

2024-07-25 14:43:40 -04:00 · 2024-07-25 14:43:40 -04:00 · 775f45cfe2
commit 775f45cfe2
parent 187897874b 700c106680
12 changed files with 64 additions and 28 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -2101,11 +2101,11 @@ config :pleroma, :config_description, [
        ]
      },
      %{
-        key: :failure_backoff,
+        key: :timeout,
        type: :integer,
        description:
-          "Amount of milliseconds after request failure, during which the request will not be retried.",
-        suggestions: [60_000]
+          "Amount of milliseconds after which the HTTP request is forcibly terminated.",
+        suggestions: [5_000]
      }
    ]
  },