Fix delivery worker counting unsalvageable HTTP errors as successes (#37235)

This commit is contained in:
Shlee authored and GitHub committed 2026-01-13 13:49:36 +00:00
1 parent d5264b3722
commit 232b9e9cc6
1 file changed
+8 -4
+8 -4
View File
@@ -38,7 +38,7 @@ class ActivityPub::DeliveryWorker
if @inbox_url.present?
if @performed
failure_tracker.track_success!
else
elsif !@unsalvageable
failure_tracker.track_failure!
end
end
@@ -62,9 +62,13 @@ class ActivityPub::DeliveryWorker
stoplight_wrapper.run do
request_pool.with(@host) do |http_client|
build_request(http_client).perform do |response|
raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || unsalvageable_authorization_failure?(response)
@performed = true
if response_successful?(response)
@performed = true
elsif response_error_unsalvageable?(response) || unsalvageable_authorization_failure?(response)
@unsalvageable = true
else
raise Mastodon::UnexpectedResponseError, response
end
end
end
end