mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2024-12-29 03:46:04 +01:00
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066
This commit is contained in:
commit
6e6f1ead31
@ -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
|
||||
|
@ -1369,6 +1369,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
||||
data <- maybe_update_follow_information(data) do
|
||||
{:ok, data}
|
||||
else
|
||||
{:error, "Object has been deleted"} = e ->
|
||||
Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
|
||||
{:error, e}
|
||||
|
||||
e ->
|
||||
Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
|
||||
{:error, e}
|
||||
|
Loading…
Reference in New Issue
Block a user