From 2eab41cd1a38fd382a735f32c6ecba7ec193f6f2 Mon Sep 17 00:00:00 2001 From: abcang Date: Sat, 14 Oct 2017 21:38:57 +0900 Subject: Close connection when succeeded posting (#5390) * Close connection when succeeded posting * Update webmock --- app/workers/activitypub/delivery_worker.rb | 3 ++- app/workers/pubsubhubbub/delivery_worker.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'app/workers') diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index 7b1e06a70..ae86e3dd2 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -16,6 +16,7 @@ class ActivityPub::DeliveryWorker raise Mastodon::UnexpectedResponseError, @response unless response_successful? + @response.connection&.close failure_tracker.track_success! rescue => e failure_tracker.track_failure! @@ -31,7 +32,7 @@ class ActivityPub::DeliveryWorker end def perform_request - @response = build_request.perform.flush + @response = build_request.perform end def response_successful? diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb index c3506727b..a9174edd2 100644 --- a/app/workers/pubsubhubbub/delivery_worker.rb +++ b/app/workers/pubsubhubbub/delivery_worker.rb @@ -27,6 +27,7 @@ class Pubsubhubbub::DeliveryWorker raise Mastodon::UnexpectedResponseError, payload_delivery unless response_successful? + payload_delivery.connection&.close subscription.touch(:last_successful_delivery_at) end @@ -37,7 +38,7 @@ class Pubsubhubbub::DeliveryWorker def callback_post_payload request = Request.new(:post, subscription.callback_url, body: payload) request.add_headers(headers) - request.perform.flush + request.perform end def blocked_domain? -- cgit