From b85f216cbcb0a99aac6f7f11e6254452a8f6c3dc Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 3 May 2019 23:45:37 +0200
Subject: [PATCH] Do not retry processing ActivityPub jobs raising validation
errors (#10614)
* Do not retry processing ActivityPub jobs raising validation errors
Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.
* Lower RecordInvalid error reporting to debug log level
* Remove trailing whitespace
---
app/workers/activitypub/processing_worker.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index a3abe72cf6..05139f616d 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -7,5 +7,7 @@ class ActivityPub::ProcessingWorker
def perform(account_id, body, delivered_to_account_id = nil)
ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true)
+ rescue ActiveRecord::RecordInvalid => e
+ Rails.logger.debug "Error processing incoming ActivityPub object: #{e}"
end
end
--
GitLab