aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-01-28 20:19:07 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-01-28 20:19:07 +0000
commit83b7062634d10bfa91adeb89bac10d854d6213d5 (patch)
treea53b08ff003593e6466e9e8277bb8c14cf9239ca
parent8fb16e9f0f246e459fe6744fcf9b5d382a7c5c3f (diff)
downloadpleroma-83b7062634d10bfa91adeb89bac10d854d6213d5.tar.gz
rich media: parser: cache negatives
-rw-r--r--lib/pleroma/web/rich_media/parser.ex16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index bd21d2a0e..279e27273 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -15,11 +15,13 @@ defmodule Pleroma.Web.RichMedia.Parser do
def parse(url), do: parse_url(url)
else
def parse(url) do
- with {:ok, data} <- Cachex.fetch(:rich_media_cache, url, fn _ -> parse_url(url) end) do
- data
- else
- _e ->
- {:error, "Parsing error"}
+ try do
+ Cachex.fetch!(:rich_media_cache, url, fn _ ->
+ {:commit, parse_url(url)}
+ end)
+ rescue
+ e ->
+ {:error, "Cachex error: #{inspect(e)}"}
end
end
end
@@ -30,8 +32,8 @@ defmodule Pleroma.Web.RichMedia.Parser do
html |> maybe_parse() |> get_parsed_data()
rescue
- _e ->
- {:error, "Parsing error"}
+ e ->
+ {:error, "Parsing error: #{inspect(e)}"}
end
end