autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daigo 3 Dango 2017-09-23 23:14:06 -10:00 committed by Eugen Rochko
parent 2f079573ed
commit a0bbeafb04
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/workers/activitypub/delivery_worker.rb
View File

@ -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

2
app/workers/pubsubhubbub/delivery_worker.rb
View File

@ -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

2
app/workers/pubsubhubbub/subscribe_worker.rb
View File

@ -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