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

master
Daigo 3 Dango 7 years ago committed by Eugen Rochko
parent 2f079573ed
commit a0bbeafb04
  1. 2
      app/workers/activitypub/delivery_worker.rb
  2. 2
      app/workers/pubsubhubbub/delivery_worker.rb
  3. 2
      app/workers/pubsubhubbub/subscribe_worker.rb

@ -16,7 +16,7 @@ class ActivityPub::DeliveryWorker
raise Mastodon::UnexpectedResponseError, @response unless response_successful?
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
private

@ -17,7 +17,7 @@ class Pubsubhubbub::DeliveryWorker
@payload = payload
process_delivery unless blocked_domain?
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
private

@ -29,6 +29,6 @@ class Pubsubhubbub::SubscribeWorker
logger.debug "PuSH re-subscribing to #{account.acct}"
::SubscribeService.new.call(account)
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

Loading…
Cancel
Save