diff options
| author | lambda <lain@soykaf.club> | 2019-03-29 12:46:05 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-03-29 12:46:05 +0000 |
| commit | a5edc4da6225ff2bf1ea8862b1c857d7e87c920f (patch) | |
| tree | 8f71e5e0ea01e964b5232e4de24389a8353f3d2a /config | |
| parent | 749d53e2b2ffb108964c569f04e5989c63643338 (diff) | |
| parent | 9a39d1d84613bb11542a0628e8b762970bd18bd0 (diff) | |
| download | pleroma-a5edc4da6225ff2bf1ea8862b1c857d7e87c920f.tar.gz pleroma-a5edc4da6225ff2bf1ea8862b1c857d7e87c920f.zip | |
Merge branch 'pleroma_job_queue' into 'develop'
Replace Pleroma.Jobs with `pleroma_job_queue`
See merge request pleroma/pleroma!992
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index bd8922b77..0df38d75a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -348,10 +348,10 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue, initial_timeout: 30, max_retries: 5 -config :pleroma, Pleroma.Jobs, - federator_incoming: [max_jobs: 50], - federator_outgoing: [max_jobs: 50], - mailer: [max_jobs: 10] +config :pleroma_job_queue, :queues, + federator_incoming: 50, + federator_outgoing: 50, + mailer: 10 config :pleroma, :fetch_initial_posts, enabled: false, diff --git a/config/test.exs b/config/test.exs index 3691e5bd1..6a7b9067e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -48,7 +48,7 @@ config :web_push_encryption, :vapid_details, config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] +config :pleroma_job_queue, disabled: true try do import_config "test.secret.exs" |