logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 6b8c15a4a1fdbc2a2a4ef194d9519e717470c632
parent 8b61d4e3e124c4fafeaabe58a8c7673f767b2871
Author: Mark Felder <feld@feld.me>
Date:   Mon, 27 May 2024 14:11:42 -0400

Remove MediaProxyWarmingPolicy config for ConcurrentLimiter as we are not using it

Diffstat:

Mconfig/config.exs1-
Mlib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex6+-----
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/config/config.exs b/config/config.exs @@ -902,7 +902,6 @@ config :pleroma, Pleroma.User.Backup, config :pleroma, ConcurrentLimiter, [ {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, - {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}, {Pleroma.Search, [max_running: 30, max_waiting: 50]} ] diff --git a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex @@ -22,11 +22,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do Logger.debug("Prefetching #{inspect(url)} as #{inspect(prefetch_url)}") - if Pleroma.Config.get(:env) == :test do - fetch(prefetch_url) - else - Task.start(fn -> fetch(prefetch_url) end) - end + fetch(prefetch_url) end end