about summary refs log tree commit diff
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-21 02:47:16 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:17:31 -0500
commit641e5acc096589c06e1f0513064e902e7ec94031 (patch)
treef926fcc948ec4f58ec0e61d790ccf3d920f5aed5
parentd6f37c6ae01c57164a69c6b7e4934d844a0c2a3a (diff)
exceptions: gotta catch em all
-rw-r--r--app/services/import_service.rb2
1 files changed, 1 insertions, 1 deletions
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