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/description.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/description.exs')
-rw-r--r-- | config/description.exs | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 493d362d3..715a0d0c3 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3330,5 +3330,53 @@ config :pleroma, :config_description, [ suggestions: [:text, :protobuf] } ] + }, + %{ + group: :pleroma, + key: ConcurrentLimiter, + type: :group, + description: "Limits configuration for background tasks.", + children: [ + %{ + key: Pleroma.Web.RichMedia.Helpers, + type: :keyword, + description: "Concurrent limits configuration for getting RichMedia for activities.", + suggestions: [max_running: 5, max_waiting: 5], + children: [ + %{ + key: :max_running, + type: :integer, + description: "Max running concurrently jobs.", + suggestion: [5] + }, + %{ + key: :max_waiting, + type: :integer, + description: "Max waiting jobs.", + suggestion: [5] + } + ] + }, + %{ + key: Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, + type: :keyword, + description: "Concurrent limits configuration for MediaProxyWarmingPolicy.", + suggestions: [max_running: 5, max_waiting: 5], + children: [ + %{ + key: :max_running, + type: :integer, + description: "Max running concurrently jobs.", + suggestion: [5] + }, + %{ + key: :max_waiting, + type: :integer, + description: "Max waiting jobs.", + suggestion: [5] + } + ] + } + ] } ] |