aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/description.exs9
-rw-r--r--config/test.exs4
3 files changed, 4 insertions, 12 deletions
diff --git a/config/config.exs b/config/config.exs
index 3577cd101..6fc84efc2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -498,8 +498,7 @@ config :pleroma, Pleroma.User,
config :pleroma, Oban,
repo: Pleroma.Repo,
- verbose: false,
- prune: {:maxlen, 1500},
+ log: false,
queues: [
activity_expiration: 10,
federator_incoming: 50,
diff --git a/config/description.exs b/config/description.exs
index f461feb04..b0cc8d527 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2034,19 +2034,12 @@ config :pleroma, :config_description, [
""",
children: [
%{
- key: :verbose,
+ key: :log,
type: {:dropdown, :atom},
description: "Logs verbose mode",
suggestions: [false, :error, :warn, :info, :debug]
},
%{
- key: :prune,
- type: [:atom, :tuple],
- description:
- "Non-retryable jobs [pruning settings](https://github.com/sorentwo/oban#pruning)",
- suggestions: [:disabled, {:maxlen, 1500}, {:maxage, 60 * 60}]
- },
- %{
key: :queues,
type: {:keyword, :integer},
description:
diff --git a/config/test.exs b/config/test.exs
index e6596e0bc..d45c36b7b 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -79,8 +79,8 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :pleroma, Oban,
queues: false,
- prune: :disabled,
- crontab: false
+ crontab: false,
+ plugins: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,