Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop'

RichMedia: Fix log spam on failures and resetting TTL on cached errors

See merge request pleroma/pleroma!3006
This commit is contained in:
rinpatch 2020-09-17 14:13:24 +00:00
commit cd93aa2aed
1 changed files with 46 additions and 21 deletions

View File

@ -20,36 +20,61 @@ def parse(url) do
with {:ok, data} <- get_cached_or_parse(url), with {:ok, data} <- get_cached_or_parse(url),
{:ok, _} <- set_ttl_based_on_image(data, url) do {:ok, _} <- set_ttl_based_on_image(data, url) do
{:ok, data} {:ok, data}
else
{:error, {:invalid_metadata, data}} = e ->
Logger.debug(fn -> "Incomplete or invalid metadata for #{url}: #{inspect(data)}" end)
e
error ->
Logger.error(fn -> "Rich media error for #{url}: #{inspect(error)}" end)
error
end end
end end
defp get_cached_or_parse(url) do defp get_cached_or_parse(url) do
case Cachex.fetch!(:rich_media_cache, url, fn _ -> {:commit, parse_url(url)} end) do case Cachex.fetch(:rich_media_cache, url, fn ->
{:ok, _data} = res -> case parse_url(url) do
res {:ok, _} = res ->
{:commit, res}
{:error, :body_too_large} = e -> {:error, reason} = e ->
e # Unfortunately we have to log errors here, instead of doing that
# along with ttl setting at the bottom. Otherwise we can get log spam
# if more than one process was waiting for the rich media card
# while it was generated. Ideally we would set ttl here as well,
# so we don't override it number_of_waiters_on_generation
# times, but one, obviously, can't set ttl for not-yet-created entry
# and Cachex doesn't support returning ttl from the fetch callback.
log_error(url, reason)
{:commit, e}
end
end) do
{action, res} when action in [:commit, :ok] ->
case res do
{:ok, _data} = res ->
res
{:error, {:content_type, _}} = e -> {:error, reason} = e ->
e if action == :commit, do: set_error_ttl(url, reason)
e
end
# The TTL is not set for the errors above, since they are unlikely to change {:error, e} ->
# with time {:error, {:cachex_error, e}}
{:error, _} = e ->
ttl = Pleroma.Config.get([:rich_media, :failure_backoff], 60_000)
Cachex.expire(:rich_media_cache, url, ttl)
e
end end
end end
defp set_error_ttl(_url, :body_too_large), do: :ok
defp set_error_ttl(_url, {:content_type, _}), do: :ok
# The TTL is not set for the errors above, since they are unlikely to change
# with time
defp set_error_ttl(url, _reason) do
ttl = Pleroma.Config.get([:rich_media, :failure_backoff], 60_000)
Cachex.expire(:rich_media_cache, url, ttl)
:ok
end
defp log_error(url, {:invalid_metadata, data}) do
Logger.debug(fn -> "Incomplete or invalid metadata for #{url}: #{inspect(data)}" end)
end
defp log_error(url, reason) do
Logger.warn(fn -> "Rich media error for #{url}: #{inspect(reason)}" end)
end
end end
@doc """ @doc """