diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-06-27 12:08:11 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-06-27 12:08:11 +0000 |
| commit | 41f2ee69a84178b83eb045145de72728208d399b (patch) | |
| tree | 5473eca0ff7b1b1e3e6751b7081a10fd6358e0a9 /config | |
| parent | 4e26fbda082f52bbb2a7db634744978fb4586a6b (diff) | |
| parent | 179efd94677d1d30bdbbbbaafc899c8c908181d2 (diff) | |
| download | pleroma-41f2ee69a84178b83eb045145de72728208d399b.tar.gz pleroma-41f2ee69a84178b83eb045145de72728208d399b.zip | |
Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
Detail backup states
Closes #3024
See merge request pleroma/pleroma!3809
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 178b6be99..a92ab574b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -871,7 +871,9 @@ config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthent config :pleroma, Pleroma.User.Backup, purge_after_days: 30, limit_days: 7, - dir: nil + dir: nil, + process_wait_time: 30_000, + process_chunk_size: 100 config :pleroma, ConcurrentLimiter, [ {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, diff --git a/config/description.exs b/config/description.exs index 5f8add8a4..d18649ae8 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3364,6 +3364,21 @@ config :pleroma, :config_description, [ type: :integer, 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] } ] }, |