diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-05 03:20:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 03:20:37 +0200 |
| commit | aa464aa0d81607696e81b559471b089f4bb2ac11 (patch) | |
| tree | 41fdf3a2227ce785bbf152d85e57236393509ea4 /app/workers | |
| parent | 41ba74b511916330771c097cd74f3bc07801291f (diff) | |
| parent | a23123e49c1449c807538bf75ff5db535a2aadf8 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/feed_insert_worker.rb | 15 | ||||
| -rw-r--r-- | app/workers/pubsubhubbub/delivery_worker.rb | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb new file mode 100644 index 000000000..a58dfaa74 --- /dev/null +++ b/app/workers/feed_insert_worker.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class FeedInsertWorker + include Sidekiq::Worker + + def perform(status_id, follower_id) + status = Status.find(status_id) + follower = Account.find(follower_id) + + return if FeedManager.instance.filter?(:home, status, follower.id) + FeedManager.instance.push(:home, follower, status) + rescue ActiveRecord::RecordNotFound + true + end +end diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb index 15005bc80..466def3a8 100644 --- a/app/workers/pubsubhubbub/delivery_worker.rb +++ b/app/workers/pubsubhubbub/delivery_worker.rb @@ -22,6 +22,7 @@ class Pubsubhubbub::DeliveryWorker .headers(headers) .post(subscription.callback_url, body: payload) + return subscription.destroy! if response.code > 299 && response.code < 500 && response.code != 429 # HTTP 4xx means error is not temporary, except for 429 (throttling) raise "Delivery failed for #{subscription.callback_url}: HTTP #{response.code}" unless response.code > 199 && response.code < 300 subscription.touch(:last_successful_delivery_at) |