logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 930cbd6d05653033e9f6d16960d698f5db4ae624
parent: 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat, 12 Oct 2019 14:42:55 +0000

Merge branch 'fix/mediaproxy-too-brutal' into 'develop'

Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836

Diffstat:

Mlib/pleroma/reverse_proxy/reverse_proxy.ex6++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex @@ -401,11 +401,9 @@ defmodule Pleroma.ReverseProxy do defp client, do: Pleroma.ReverseProxy.Client - defp track_failed_url(url, code, opts) do - code = to_string(code) - + defp track_failed_url(url, error, opts) do ttl = - if code in ["403", "404"] or String.starts_with?(code, "5") do + unless error in [:body_too_large, 400, 204] do Keyword.get(opts, :failed_request_ttl, @failed_request_ttl) else nil