Close http connection in perform method of Request class (#6889)
HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.
This commit is contained in:
committed by
Eugen Rochko
parent
4e71b104e6
commit
54b273bf99
@ -23,22 +23,17 @@ class Pubsubhubbub::DeliveryWorker
|
||||
private
|
||||
|
||||
def process_delivery
|
||||
payload_delivery
|
||||
callback_post_payload do |payload_delivery|
|
||||
raise Mastodon::UnexpectedResponseError, payload_delivery unless response_successful? payload_delivery
|
||||
end
|
||||
|
||||
raise Mastodon::UnexpectedResponseError, payload_delivery unless response_successful?
|
||||
|
||||
payload_delivery.connection&.close
|
||||
subscription.touch(:last_successful_delivery_at)
|
||||
end
|
||||
|
||||
def payload_delivery
|
||||
@_payload_delivery ||= callback_post_payload
|
||||
end
|
||||
|
||||
def callback_post_payload
|
||||
def callback_post_payload(&block)
|
||||
request = Request.new(:post, subscription.callback_url, body: payload)
|
||||
request.add_headers(headers)
|
||||
request.perform
|
||||
request.perform(&block)
|
||||
end
|
||||
|
||||
def blocked_domain?
|
||||
@ -80,7 +75,7 @@ class Pubsubhubbub::DeliveryWorker
|
||||
OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret, payload)
|
||||
end
|
||||
|
||||
def response_successful?
|
||||
def response_successful?(payload_delivery)
|
||||
payload_delivery.code > 199 && payload_delivery.code < 300
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user