From 8f285a787f7af0436de18ac140712801a69eff05 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 21 Jun 2024 13:24:47 -0400
Subject: Refactor backups to be fully controlled by Oban

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 410b9bbab..2a007a22d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -187,6 +187,8 @@ config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
 config :pleroma, Pleroma.Web.RichMedia.Backfill,
   stream_out: Pleroma.Web.ActivityPub.ActivityPubMock
 
+config :pleroma, Pleroma.User.Backup, tempdir: "test/tmp"
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From 187897874bddc27ef23606730e79522e3583ec43 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 22 Jul 2024 14:00:54 -0400
Subject: Make backup timeout configurable

---
 config/config.exs      |  4 ++--
 config/description.exs | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 044f951f6..3058160ea 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -908,8 +908,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 b7d86dc63..179eea3f7 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3355,20 +3355,19 @@ config :pleroma, :config_description, [
         description: "Limit user to export not more often than once per N days",
         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]
       }
     ]
   },
-- 
cgit v1.2.3