fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-11 18:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'

Browse source 
Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837
This commit is contained in:
rinpatch 2019-10-12 14:54:49 +00:00
parent d9410c488a a8afbe977a
commit 1f99abbeba
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/reverse_proxy/reverse_proxy.ex
View file

@ -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