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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index c7d8a2dae..5c0fd6487 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -1110,3 +1110,15 @@ Settings to enable and configure expiration for ephemeral activities * `:enabled` - enables ephemeral activities creation * `:min_lifetime` - minimum lifetime for ephemeral activities (in seconds). Default: 10 minutes. + +## ConcurrentLimiter + +Settings to restrict concurrently running jobs. Jobs which can be configured: + +* `Pleroma.Web.RichMedia.Helpers` - generating link previews of URLs in activities +* `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy` - warming remote media cache via MediaProxyWarmingPolicy + +Each job has these settings: + +* `:max_running` - max concurrently runnings jobs +* `:max_waiting` - max waiting jobs |