]> cat aescling's git repositories - mastodon.git/commitdiff
Do not retry processing ActivityPub jobs raising validation errors (#10614)
authorThibG <thib@sitedethib.com>
Fri, 3 May 2019 21:45:37 +0000 (23:45 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 3 May 2019 21:45:37 +0000 (23:45 +0200)
* 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

index a3abe72cf66eed1b4ee038906d4075c35bcc2f8c..05139f616db9688890ffa638eb2faf554fdb16cf 100644 (file)
@@ -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