diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-08-21 00:47:28 -0500 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:19 -0500 |
commit | 38f78fd1a2045a6641d76b12f7145f39de10ae53 (patch) | |
tree | 7fa8399c5a8b7a83603f885e5fcb8417d494adc2 /app/services/activitypub/process_collection_items_service.rb | |
parent | f073087da2cdb8c15dfc0f4b9c2a4967e4714be1 (diff) |
[Federation, Revise] Add simple retries to ActivityPub::ProcessCollectionItemsService
Diffstat (limited to 'app/services/activitypub/process_collection_items_service.rb')
-rw-r--r-- | app/services/activitypub/process_collection_items_service.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/services/activitypub/process_collection_items_service.rb b/app/services/activitypub/process_collection_items_service.rb index 936593166..9c30d81e9 100644 --- a/app/services/activitypub/process_collection_items_service.rb +++ b/app/services/activitypub/process_collection_items_service.rb @@ -5,12 +5,18 @@ class ActivityPub::ProcessCollectionItemsService < BaseService RedisLock.acquire(lock_options(account_id)) do |lock| if lock.acquired? CollectionItem.unprocessed.where(account_id: account_id).find_each do |item| + # Avoid failing servers holding up the rest of the queue. + next if item.retries.positive? && rand(3).positive? + begin FetchRemoteStatusService.new.call(item.uri, nil, on_behalf_of) rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotFound nil + rescue HTTP::TimeoutError + item.increment!(:retries) end - item.update!(processed: true) + + item.update!(processed: true) if item.retries.zero? || item.retries > 4 end end end |