summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2021-01-09 18:52:40 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2021-01-21 09:47:21 +0300
commitb4ff63d020293bd633bc9c01af1078cacf7f90ed (patch)
treee0d3133ce691b840a5993ff7cfe896aa68f083b4 /config
parentb5899fda1a38c2ce2d26ebd5082d864c84105622 (diff)
configurable limits for ConcurrentLimiter
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
Diffstat (limited to 'config')
-rw-r--r--config/config.exs5
-rw-r--r--config/description.exs48
2 files changed, 53 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 70d0c2c2b..e07e67de9 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.MediaProxy, [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"
diff --git a/config/description.exs b/config/description.exs
index 493d362d3..49fea4234 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.MediaProxy,
+ 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]
+ }
+ ]
+ }
+ ]
}
]