diff options
| author | lain <lain@soykaf.club> | 2020-11-20 10:30:02 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-20 10:30:02 +0000 |
| commit | d8924e1a56d51ac67d4cca6f9efb57fae33bbed4 (patch) | |
| tree | dba991ba638ac7823db2152bf7bb97c8e9f086aa | |
| parent | 79a509ee61dafccf0aa63d8c56365e59e1af238b (diff) | |
| parent | 0a5b22bc3b1a0011b83e1a77f4f58700266c260a (diff) | |
Merge branch 'fix/mix-tasks' into 'develop'
Start limiters in mix tasks
Closes #2320
See merge request pleroma/pleroma!3165
| -rw-r--r-- | lib/mix/pleroma.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/application.ex | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 3de11efce..6df1cf538 100644 --- a/lib/mix/pleroma.ex +++ b/lib/mix/pleroma.ex @@ -19,6 +19,7 @@ defmodule Mix.Pleroma do def start_pleroma do Pleroma.Config.Holder.save_default() Pleroma.Config.Oban.warn() + Pleroma.Application.limiters_setup() Application.put_env(:phoenix, :serve_endpoints, false, persistent: true) if Pleroma.Config.get(:env) != :test do diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index d3c32942c..ced14f87f 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -274,6 +274,7 @@ defmodule Pleroma.Application do defp http_children(_, _), do: [] + @spec limiters_setup() :: :ok def limiters_setup do [Pleroma.Web.RichMedia.Helpers, Pleroma.Web.MediaProxy] |> Enum.each(&ConcurrentLimiter.new(&1, 1, 0)) |