From 641e5acc096589c06e1f0513064e902e7ec94031 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Tue, 21 May 2019 02:47:16 -0500 Subject: [PATCH] exceptions: gotta catch em all --- app/services/import_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/import_service.rb b/app/services/import_service.rb index be3880d40..9b0a03081 100644 --- a/app/services/import_service.rb +++ b/app/services/import_service.rb @@ -212,7 +212,7 @@ class ImportService < BaseService activity = ActivityPub::Activity.factory(activity, @account, imported: true) activity&.perform - rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotFound, Mastodon::ValidationError => e + rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotFound, Mastodon::ValidationError, HTTP::ConnectionError, HTTP::TimeoutError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e Rails.logger.error "Error importing status (ActivityPub): #{e}" nil end