diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-10 18:45:04 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-10 18:45:04 +0000 |
| commit | 0254696e30132f48e585154450aff87afb259e1d (patch) | |
| tree | 26c912a3d082c4e9a407ea451862e39bf75d068a /config | |
| parent | 541a3eede257c683edc5b50f5b459125d551013c (diff) | |
| parent | 8af1fd32234df7d0cdb74d78bcca9f68587b70f2 (diff) | |
| download | pleroma-0254696e30132f48e585154450aff87afb259e1d.tar.gz pleroma-0254696e30132f48e585154450aff87afb259e1d.zip | |
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 1a2b312b5..95a6ea9db 100644 --- a/config/config.exs +++ b/config/config.exs @@ -530,6 +530,7 @@ config :pleroma, Oban, log: false, queues: [ activity_expiration: 10, + token_expiration: 5, federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -543,7 +544,6 @@ config :pleroma, Oban, ], plugins: [Oban.Plugins.Pruner], crontab: [ - {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} diff --git a/config/description.exs b/config/description.exs index eac97ad64..4c4deed30 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2290,7 +2290,6 @@ config :pleroma, :config_description, [ type: {:list, :tuple}, description: "Settings for cron background jobs", suggestions: [ - {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} |