diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-01 17:28:00 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-01 17:28:00 +0300 |
| commit | 23d279e03ee1f7a1285614754738711359bc4b81 (patch) | |
| tree | 4ec0b67b1ef6f8588546d5fb04e09a2b8a4aa57a /config | |
| parent | cdfd02e90455fe7c01026efb48af3194cc82252b (diff) | |
| download | pleroma-23d279e03ee1f7a1285614754738711359bc4b81.tar.gz pleroma-23d279e03ee1f7a1285614754738711359bc4b81.zip | |
[#1149] Replaced RetryQueue with oban-based retries.
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 17 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 14 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 17770640a..1bb325bf5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -440,13 +440,7 @@ config :pleroma, Pleroma.User, "web" ] -config :pleroma, Pleroma.Web.Federator.RetryQueue, - enabled: false, - max_jobs: 20, - initial_timeout: 30, - max_retries: 5 - -config :pleroma_job_queue, :queues, +job_queues = [ federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -454,6 +448,15 @@ config :pleroma_job_queue, :queues, transmogrifier: 20, scheduled_activities: 10, background: 5 +] + +config :pleroma_job_queue, :queues, job_queues + +config :pleroma, Oban, + repo: Pleroma.Repo, + verbose: false, + prune: {:maxage, 60 * 60 * 24 * 7}, + queues: job_queues config :pleroma, :fetch_initial_posts, enabled: false, diff --git a/config/test.exs b/config/test.exs index 92dca18bc..23d9bf779 100644 --- a/config/test.exs +++ b/config/test.exs @@ -62,6 +62,10 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma_job_queue, disabled: true +config :pleroma, Oban, + queues: false, + prune: :disabled + config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, total_user_limit: 3, |