Browse Source

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

Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837
tags/v1.1.4
rinpatch 4 years ago
parent
commit
1f99abbeba
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      lib/pleroma/reverse_proxy/reverse_proxy.ex

+ 2
- 4
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


Loading…
Cancel
Save