Merge remote-tracking branch 'origin/develop' into post-languages

3 files changed, 16 insertions, 40 deletions

diff --git a/config/config.exs b/config/config.exs
index 30626d4a1..ad6b1cb94 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -588,9 +588,8 @@ config :pleroma, Oban,
   queues: [
     activity_expiration: 10,
     federator_incoming: 5,
-    federator_outgoing: 5,
+    federator_outgoing: 25,
     web_push: 50,
-    transmogrifier: 20,
     background: 20,
     search_indexing: [limit: 10, paused: true],
     slow: 5
@@ -601,13 +600,6 @@ config :pleroma, Oban,
     {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
   ]
 
-config :pleroma, :workers,
-  retries: [
-    federator_incoming: 5,
-    federator_outgoing: 5,
-    search_indexing: 2
-  ]
-
 config :pleroma, Pleroma.Formatter,
   class: false,
   rel: "ugc",
@@ -859,19 +851,19 @@ config :pleroma, :pools,
 config :pleroma, :hackney_pools,
   federation: [
     max_connections: 50,
-    timeout: 150_000
+    timeout: 10_000
   ],
   media: [
     max_connections: 50,
-    timeout: 150_000
+    timeout: 15_000
   ],
   rich_media: [
     max_connections: 50,
-    timeout: 150_000
+    timeout: 15_000
   ],
   upload: [
     max_connections: 25,
-    timeout: 300_000
+    timeout: 15_000
   ]
 
 config :pleroma, :majic_pool, size: 2
@@ -910,8 +902,8 @@ config :pleroma, Pleroma.User.Backup,
   purge_after_days: 30,
   limit_days: 7,
   dir: nil,
-  process_wait_time: 30_000,
-  process_chunk_size: 100
+  process_chunk_size: 100,
+  timeout: :timer.minutes(30)
 
 config :pleroma, ConcurrentLimiter, [
   {Pleroma.Search, [max_running: 30, max_waiting: 50]}
diff --git a/config/description.exs b/config/description.exs
index 10a6e9cdf..15faecb38 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2015,23 +2015,6 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: :workers,
-    type: :group,
-    description: "Includes custom worker options not interpretable directly by `Oban`",
-    children: [
-      %{
-        key: :retries,
-        type: {:keyword, :integer},
-        description: "Max retry attempts for failed jobs, per `Oban` queue",
-        suggestions: [
-          federator_incoming: 5,
-          federator_outgoing: 5
-        ]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
     key: Pleroma.Web.Metadata,
     type: :group,
     description: "Metadata-related settings",
@@ -3356,19 +3339,18 @@ config :pleroma, :config_description, [
         suggestions: [7]
       },
       %{
-        key: :process_wait_time,
-        type: :integer,
-        label: "Process Wait Time",
-        description:
-          "The amount of time to wait for backup to report progress, in milliseconds. If no progress is received from the backup job for that much time, terminate it and deem it failed.",
-        suggestions: [30_000]
-      },
-      %{
         key: :process_chunk_size,
         type: :integer,
         label: "Process Chunk Size",
         description: "The number of activities to fetch in the backup job for each chunk.",
         suggestions: [100]
+      },
+      %{
+        key: :timeout,
+        type: :integer,
+        label: "Timeout",
+        description: "The amount of time to wait for backup to complete in seconds.",
+        suggestions: [1_800]
       }
     ]
   },
diff --git a/config/test.exs b/config/test.exs
index 8a5694054..6fe84478a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -188,6 +188,8 @@ config :pleroma, Pleroma.Web.RichMedia.Backfill,
 
 config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, enable: false
 
+config :pleroma, Pleroma.User.Backup, tempdir: "test/tmp"
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else