diff options
| author | feld <feld@feld.me> | 2021-01-21 14:59:51 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-21 14:59:51 +0000 |
| commit | d8860eaee46c9bc0a079e90dfb008c54923d7330 (patch) | |
| tree | faa150ff299ce6207d5a56541262aaa5e31901cd /config/config.exs | |
| parent | ba40af054cc90417c5b2b347e325b53c7346e29c (diff) | |
| parent | 5ade430e46e76543b317dc07fdbc0a3fe7367621 (diff) | |
| download | pleroma-d8860eaee46c9bc0a079e90dfb008c54923d7330.tar.gz pleroma-d8860eaee46c9bc0a079e90dfb008c54923d7330.zip | |
Merge branch 'limiter-setup-fix' into 'develop'
Configurable limits for ConcurrentLimiter for Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxyWarmingPolicy
See merge request pleroma/pleroma!3248
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 70d0c2c2b..c4a690799 100644 --- a/config/config.exs +++ b/config/config.exs @@ -832,6 +832,11 @@ config :pleroma, Pleroma.User.Backup, limit_days: 7, dir: nil +config :pleroma, ConcurrentLimiter, [ + {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, + {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]} +] + # 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" |