Skip to content
Snippets Groups Projects
Commit a0bbeafb authored by Daigo 3 Dango's avatar Daigo 3 Dango Committed by Eugen Rochko
Browse files

Suppress backtrace when failed to communicate with a remote instance (#5076)

parent 2f079573
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ class ActivityPub::DeliveryWorker ...@@ -16,7 +16,7 @@ class ActivityPub::DeliveryWorker
raise Mastodon::UnexpectedResponseError, @response unless response_successful? raise Mastodon::UnexpectedResponseError, @response unless response_successful?
rescue => e rescue => e
raise e.class, "Delivery failed for #{inbox_url}: #{e.message}" raise e.class, "Delivery failed for #{inbox_url}: #{e.message}", e.backtrace[0]
end end
private private
......
...@@ -17,7 +17,7 @@ class Pubsubhubbub::DeliveryWorker ...@@ -17,7 +17,7 @@ class Pubsubhubbub::DeliveryWorker
@payload = payload @payload = payload
process_delivery unless blocked_domain? process_delivery unless blocked_domain?
rescue => e rescue => e
raise e.class, "Delivery failed for #{subscription&.callback_url}: #{e.message}" raise e.class, "Delivery failed for #{subscription&.callback_url}: #{e.message}", e.backtrace[0]
end end
private private
......
...@@ -29,6 +29,6 @@ class Pubsubhubbub::SubscribeWorker ...@@ -29,6 +29,6 @@ class Pubsubhubbub::SubscribeWorker
logger.debug "PuSH re-subscribing to #{account.acct}" logger.debug "PuSH re-subscribing to #{account.acct}"
::SubscribeService.new.call(account) ::SubscribeService.new.call(account)
rescue => e rescue => e
raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}" raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}", e.backtrace[0]
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment