0d9ffe56fb
* Add request pool to improve delivery performance Fix #7909 * Ensure connection is closed when exception interrupts execution * Remove Timeout#timeout from socket connection * Fix infinite retrial loop on HTTP::ConnectionError * Close sockets on failure, reduce idle time to 90 seconds * Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server * Use a shared pool size, 512 by default, to stay below open file limit * Add some tests * Add more tests * Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds * Use a shared pool that returns preferred connection but re-purposes other ones when needed * Fix wrong connection being returned on subsequent calls within the same thread * Reduce mutex calls on flushes from 2 to 1 and add test for reaping
67 lines
1.9 KiB
Ruby
67 lines
1.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::DeliveryWorker
|
|
include Sidekiq::Worker
|
|
|
|
STOPLIGHT_FAILURE_THRESHOLD = 10
|
|
STOPLIGHT_COOLDOWN = 60
|
|
|
|
sidekiq_options queue: 'push', retry: 16, dead: false
|
|
|
|
HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
|
|
|
|
def perform(json, source_account_id, inbox_url, options = {})
|
|
return if DeliveryFailureTracker.unavailable?(inbox_url)
|
|
|
|
@options = options.with_indifferent_access
|
|
@json = json
|
|
@source_account = Account.find(source_account_id)
|
|
@inbox_url = inbox_url
|
|
@host = Addressable::URI.parse(inbox_url).normalized_site
|
|
|
|
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]
|
|
end
|
|
|
|
private
|
|
|
|
def build_request(http_client)
|
|
request = Request.new(:post, @inbox_url, body: @json, http_client: http_client)
|
|
request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with])
|
|
request.add_headers(HEADERS)
|
|
end
|
|
|
|
def perform_request
|
|
light = Stoplight(@inbox_url) do
|
|
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)
|
|
end
|
|
end
|
|
end
|
|
|
|
light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
|
|
.with_cool_off_time(STOPLIGHT_COOLDOWN)
|
|
.run
|
|
end
|
|
|
|
def response_successful?(response)
|
|
(200...300).cover?(response.code)
|
|
end
|
|
|
|
def response_error_unsalvageable?(response)
|
|
(400...500).cover?(response.code) && ![401, 408, 429].include?(response.code)
|
|
end
|
|
|
|
def failure_tracker
|
|
@failure_tracker ||= DeliveryFailureTracker.new(@inbox_url)
|
|
end
|
|
|
|
def request_pool
|
|
RequestPool.current
|
|
end
|
|
end
|