logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: d8924e1a56d51ac67d4cca6f9efb57fae33bbed4
parent 79a509ee61dafccf0aa63d8c56365e59e1af238b
Author: lain <lain@soykaf.club>
Date:   Fri, 20 Nov 2020 10:30:02 +0000

Merge branch 'fix/mix-tasks' into 'develop'

Start limiters in mix tasks

Closes #2320

See merge request pleroma/pleroma!3165

Diffstat:

Mlib/mix/pleroma.ex1+
Mlib/pleroma/application.ex1+
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git 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 @@ -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))