mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 00:54:49 +01:00
Fix URLs appearing twice in errors of ActivityPub::DeliveryWorker (#11231)
This commit is contained in:
parent
58276715be
commit
406b46395d
@ -59,7 +59,7 @@ class Request
|
||||
begin
|
||||
response = http_client.public_send(@verb, @url.to_s, @options.merge(headers: headers))
|
||||
rescue => e
|
||||
raise e.class, "#{e.message} on #{@url}", e.backtrace[0]
|
||||
raise e.class, "#{e.message} on #{@url}", e.backtrace
|
||||
end
|
||||
|
||||
begin
|
||||
|
@ -18,13 +18,15 @@ class ActivityPub::DeliveryWorker
|
||||
@source_account = Account.find(source_account_id)
|
||||
@inbox_url = inbox_url
|
||||
@host = Addressable::URI.parse(inbox_url).normalized_site
|
||||
@performed = false
|
||||
|
||||
perform_request
|
||||
|
||||
failure_tracker.track_success!
|
||||
rescue => e
|
||||
failure_tracker.track_failure!
|
||||
raise e.class, "Delivery failed for #{inbox_url}: #{e.message}", e.backtrace[0]
|
||||
ensure
|
||||
if @performed
|
||||
failure_tracker.track_success!
|
||||
else
|
||||
failure_tracker.track_failure!
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
@ -40,6 +42,8 @@ class ActivityPub::DeliveryWorker
|
||||
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)
|
||||
|
||||
@performed = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user