diff options
| author | Mark Felder <feld@feld.me> | 2021-02-20 14:26:59 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-02-20 14:27:42 -0600 |
| commit | 369581db6db5d2ce5396391d814d903002c7eff6 (patch) | |
| tree | 18251c0ca81ef477a8d90cffd549c2b3e56bd4d4 | |
| parent | 8829a408ecf3bfffaf59af415817220fd63a81b7 (diff) | |
| download | pleroma-369581db6db5d2ce5396391d814d903002c7eff6.tar.gz | |
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
| -rw-r--r-- | lib/pleroma/upload/filter/exiftool.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/upload/filter/mogrifun.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/upload/filter/mogrify.ex | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/upload/filter/exiftool.ex b/lib/pleroma/upload/filter/exiftool.ex index 2dbde540d..a03b32ae4 100644 --- a/lib/pleroma/upload/filter/exiftool.ex +++ b/lib/pleroma/upload/filter/exiftool.ex @@ -21,8 +21,8 @@ defmodule Pleroma.Upload.Filter.Exiftool do {error, 1} -> {:error, error} end rescue - _e in ErlangError -> - {:error, "exiftool command not found"} + e in ErlangError -> + {:error, "#{__MODULE__}: #{inspect(e)}"} end end diff --git a/lib/pleroma/upload/filter/mogrifun.ex b/lib/pleroma/upload/filter/mogrifun.ex index 9abdd2d51..01126aaeb 100644 --- a/lib/pleroma/upload/filter/mogrifun.ex +++ b/lib/pleroma/upload/filter/mogrifun.ex @@ -44,8 +44,8 @@ defmodule Pleroma.Upload.Filter.Mogrifun do Filter.Mogrify.do_filter(file, [Enum.random(@filters)]) {:ok, :filtered} rescue - _e in ErlangError -> - {:error, "mogrify command not found"} + e in ErlangError -> + {:error, "#{__MODULE__}: #{inspect(e)}"} end end diff --git a/lib/pleroma/upload/filter/mogrify.ex b/lib/pleroma/upload/filter/mogrify.ex index 4bca4f5ca..f27aefc22 100644 --- a/lib/pleroma/upload/filter/mogrify.ex +++ b/lib/pleroma/upload/filter/mogrify.ex @@ -14,8 +14,8 @@ defmodule Pleroma.Upload.Filter.Mogrify do do_filter(file, Pleroma.Config.get!([__MODULE__, :args])) {:ok, :filtered} rescue - _e in ErlangError -> - {:error, "mogrify command not found"} + e in ErlangError -> + {:error, "#{__MODULE__}: #{inspect(e)}"} end end |