From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 28 Jan 2019 20:19:07 +0000 (+0000)
Subject: rich media: parser: cache negatives
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=83b7062634d10bfa91adeb89bac10d854d6213d5;p=akkoma

rich media: parser: cache negatives
---

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