Suppress backtrace when failed to communicate with a remote instance (#5076)
This commit is contained in:
		
							parent
							
								
									2f079573ed
								
							
						
					
					
						commit
						a0bbeafb04
					
				@ -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…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user