configurable limits for ConcurrentLimiter

Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 203a95004..4742a3ecb 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -297,7 +297,16 @@ defmodule Pleroma.Application do
 
   @spec limiters_setup() :: :ok
   def limiters_setup do
+    config = Config.get(ConcurrentLimiter, [])
+
     [Pleroma.Web.RichMedia.Helpers, Pleroma.Web.MediaProxy]
-    |> Enum.each(&ConcurrentLimiter.new(&1, 1, 0))
+    |> Enum.each(fn module ->
+      mod_config = Keyword.get(config, module, [])
+
+      max_running = Keyword.get(mod_config, :max_running, 5)
+      max_waiting = Keyword.get(mod_config, :max_waiting, 5)
+
+      ConcurrentLimiter.new(module, max_running, max_waiting)
+    end)
   end
 end