mastofe

commit: 4a0a19fe54f1d2d433ad3d72c35f2bbb915279f6
parent: 338bff8b93fa939c2968818e53386fd0c013d9a9
Author: Daniel Hunsaker <danhunsaker@gmail.com>
Date:   Sat, 17 Mar 2018 06:27:50 -0600

Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)

This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.
Diffstat:
M
app/models/concerns/remotable.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
@@ -38,7 +38,7 @@ module Remotable
           send("#{attachment_name}_file_name=", basename + extname)
 
           self[attribute_name] = url if has_attribute?(attribute_name)
-        rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e
+        rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
           nil
         end