diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
| commit | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (patch) | |
| tree | 4bb60f4493fb70cada728a373f74c18b87e8f95d /app/workers/activitypub | |
| parent | f72ad67a3967230afd63a9e2d84a2a69331c4787 (diff) | |
| parent | 894da3dcca781e27ce9c5130f1021526ac8a6887 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/delivery_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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? |