diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-18 19:43:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-18 19:43:06 +0000 |
| commit | 833161b5d21f85e2276cd0cee3e148ecbe6e1f05 (patch) | |
| tree | 2f3158e266330000e25dc6a99e5b31845505a992 /config | |
| parent | a39a094cdabe9c2497fbd5cc4947650aff933c0d (diff) | |
| parent | 3f32d7b937a2368707794b55d1256bfa9fa508f4 (diff) | |
| download | pleroma-833161b5d21f85e2276cd0cee3e148ecbe6e1f05.tar.gz pleroma-833161b5d21f85e2276cd0cee3e148ecbe6e1f05.zip | |
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 271224e85..317299bf1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -332,14 +332,16 @@ config :pleroma, Pleroma.User, "web" ] -config :pleroma, Pleroma.Web.Federator, max_jobs: 50 - config :pleroma, Pleroma.Web.Federator.RetryQueue, enabled: false, max_jobs: 20, initial_timeout: 30, max_retries: 5 +config :pleroma, Pleroma.Jobs, + federator_incoming: [max_jobs: 50], + federator_outgoing: [max_jobs: 50] + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/test.exs b/config/test.exs index 412970d93..fbeba0919 100644 --- a/config/test.exs +++ b/config/test.exs @@ -44,6 +44,8 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" +config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] + try do import_config "test.secret.exs" rescue |