diff options
author | Mark Felder <feld@feld.me> | 2021-02-15 15:28:58 -0600 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2021-02-15 15:28:58 -0600 |
commit | c6480eaf240246fb611bdc55d5ffcbdcb59624f3 (patch) | |
tree | c7860ca1107dc10d672830f5e926fd270949d966 | |
parent | 390b4471f22b60eafdd436ad54e45b0a52651b4a (diff) | |
download | pleroma-c6480eaf240246fb611bdc55d5ffcbdcb59624f3.tar.gz |
Better error when using Mogrify
Hardcoding that the command isn't available is wrong. We check it on startup.
-rw-r--r-- | lib/pleroma/upload/filter/heif_to_jpeg.ex | 2 | ||||
-rw-r--r-- | lib/pleroma/upload/filter/mogrifun.ex | 2 | ||||
-rw-r--r-- | lib/pleroma/upload/filter/mogrify.ex | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/upload/filter/heif_to_jpeg.ex b/lib/pleroma/upload/filter/heif_to_jpeg.ex index f1c58f620..05f0fe816 100644 --- a/lib/pleroma/upload/filter/heif_to_jpeg.ex +++ b/lib/pleroma/upload/filter/heif_to_jpeg.ex @@ -22,7 +22,7 @@ defmodule Pleroma.Upload.Filter.HeifToJpeg do {:ok, :filtered, %Upload{upload | name: name, path: path, content_type: "image/jpeg"}} rescue e in ErlangError -> - {:error, "mogrify error: #{inspect(e)}"} + {:error, "#{__MODULE__}: #{inspect(e)}"} end end diff --git a/lib/pleroma/upload/filter/mogrifun.ex b/lib/pleroma/upload/filter/mogrifun.ex index 9abdd2d51..8c4016621 100644 --- a/lib/pleroma/upload/filter/mogrifun.ex +++ b/lib/pleroma/upload/filter/mogrifun.ex @@ -45,7 +45,7 @@ defmodule Pleroma.Upload.Filter.Mogrifun do {:ok, :filtered} rescue _e in ErlangError -> - {:error, "mogrify command not found"} + {:error, "#{__MODULE__}: #{inspect(e)}"} end end diff --git a/lib/pleroma/upload/filter/mogrify.ex b/lib/pleroma/upload/filter/mogrify.ex index 4bca4f5ca..82aa430c8 100644 --- a/lib/pleroma/upload/filter/mogrify.ex +++ b/lib/pleroma/upload/filter/mogrify.ex @@ -15,7 +15,7 @@ defmodule Pleroma.Upload.Filter.Mogrify do {:ok, :filtered} rescue _e in ErlangError -> - {:error, "mogrify command not found"} + {:error, "#{__MODULE__}: #{inspect(e)}"} end end |