diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-19 19:10:55 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-19 19:10:55 +0300 |
| commit | c0ecbf6669948740a091bdf5b5441fb6ee55f4fc (patch) | |
| tree | 9ad9fadc6855b1529df7ce8403683c32f776265b /config/config.exs | |
| parent | d3fe2c8ec6116fbc3058f7a795ef59564bddfb08 (diff) | |
| parent | 1dd718e83c76db218f12a98344b568fe10ecbefe (diff) | |
| download | pleroma-c0ecbf6669948740a091bdf5b5441fb6ee55f4fc.tar.gz pleroma-c0ecbf6669948740a091bdf5b5441fb6ee55f4fc.zip | |
[#468] Merged `upstream/develop`.
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 4 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" |