hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'publisher' into 'develop'

Browse source 
Discard some failed publisher jobs

See merge request pleroma/pleroma!4022
This commit is contained in:
Haelwenn 2023-12-29 23:18:34 +00:00
commit f74f5e0a56
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/pleroma/web/activity_pub/publisher.ex
View file

@ -117,10 +117,23 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
result
else
{_post_result, response} = e ->
{_post_result, %{status: code} = response} = e ->
unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
Logger.error("Failed to publish activity #{id} #{inspect(e)}")
{:error, response}
Logger.metadata(activity: id, inbox: inbox, status: code)
Logger.error("Publisher failed to inbox #{inbox} with status #{code}")
case response do
%{status: 403} -> {:discard, :forbidden}
%{status: 404} -> {:discard, :not_found}
%{status: 410} -> {:discard, :not_found}
_ -> {:error, e}
end
e ->
unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
Logger.metadata(activity: id, inbox: inbox)
Logger.error("Publisher failed to inbox #{inbox} #{inspect(e)}")
{:error, e}
end
end