diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
| commit | baffdcc480cea13269ef0e3af58f0a848892bb9a (patch) | |
| tree | a9499083c412b24173fa14717cec7041c6f3f45c /config | |
| parent | 642075b1a935c42181a10ea695b2289883126136 (diff) | |
| parent | dc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff) | |
| download | pleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.tar.gz pleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
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 d8378a162..2dc87a50c 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" |