about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-11 13:14:50 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-11 13:14:50 +0200
commitbe7eeb785682d80614340c63f6cf3d36e5e4fe2e (patch)
treeeeab0d51d5da661c55d41c92f2e82a44c22e5ceb /app/models
parent50491e0d92acea90e7a83d2ab0e9a1b271daa8a8 (diff)
Catch Paperclip processing failures (fixes #6378) (#7439)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/remotable.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index 7f1ef5191..20ddbca53 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -41,6 +41,9 @@ module Remotable
         rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
           nil
+        rescue Paperclip::Error => e
+          Rails.logger.debug "Error processing remote #{attachment_name}: #{e}"
+          nil
         end
       end