diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-05 20:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 20:53:07 +0200 |
| commit | e4ca5414a37b7973247a283a364b27052c8f9d1c (patch) | |
| tree | dcb7769320c5a35b229ef579a20aa2fff209ea94 /app/workers | |
| parent | 2c2f649200ba5b742ba9d17ac5ba553c752b59aa (diff) | |
| parent | eef8802325d75b2668b131a765c5555f4be8c2ce (diff) | |
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index a3abe72cf..05139f616 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 |