diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-12 14:42:55 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-12 14:42:55 +0000 |
| commit | 930cbd6d05653033e9f6d16960d698f5db4ae624 (patch) | |
| tree | c829b1809f8d574d6007a89e531fce3fdb603262 /lib | |
| parent | 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd (diff) | |
| parent | 9bdbf0811b362d8eb9d2456e9c87c9dde1b35d9b (diff) | |
| download | pleroma-930cbd6d05653033e9f6d16960d698f5db4ae624.tar.gz | |
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/reverse_proxy/reverse_proxy.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex index 78144cae3..2ed719315 100644 --- 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 |