aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-01-22 17:55:49 +0000
committerrinpatch <rinpatch@sdf.org>2020-01-22 17:55:49 +0000
commit6e6f1ead31ba26bc42b14226e3c0876042f0596a (patch)
tree0c6bc6b7da579093084d28ac72ac7e5b6b0e70df /lib/pleroma/object
parentbe2777715650d0ac80509f0bd22b4cea8641f9b3 (diff)
parent02c3031e9985892bb698436105b93ac5481b6984 (diff)
downloadpleroma-6e6f1ead31ba26bc42b14226e3c0876042f0596a.tar.gz
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066
Diffstat (limited to 'lib/pleroma/object')
-rw-r--r--lib/pleroma/object/fetcher.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index a1bde90f1..037c42339 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -117,6 +117,9 @@ defmodule Pleroma.Object.Fetcher do
{:error, %Tesla.Mock.Error{}} ->
nil
+ {:error, "Object has been deleted"} ->
+ nil
+
e ->
Logger.error("Error while fetching #{id}: #{inspect(e)}")
nil