diff options
| author | George Claghorn <george@basecamp.com> | 2019-05-30 18:20:55 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2019-05-30 18:20:55 -0400 |
| commit | 165785e8cf43456816c8152ca4295640b21d1765 (patch) | |
| tree | 2a887f5be5b4f72c8cecb4bce3b24496fe7c3828 /activestorage | |
| parent | f0445213d8f23c982d1c080a750b33d4855d46e4 (diff) | |
| download | rails-165785e8cf43456816c8152ca4295640b21d1765.tar.gz rails-165785e8cf43456816c8152ca4295640b21d1765.tar.bz2 rails-165785e8cf43456816c8152ca4295640b21d1765.zip | |
Skip image analysis on ImageMagick error
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/lib/active_storage/analyzer/image_analyzer.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activestorage/lib/active_storage/analyzer/image_analyzer.rb b/activestorage/lib/active_storage/analyzer/image_analyzer.rb index c8bc8fe953..bd1bef3076 100644 --- a/activestorage/lib/active_storage/analyzer/image_analyzer.rb +++ b/activestorage/lib/active_storage/analyzer/image_analyzer.rb @@ -43,6 +43,9 @@ module ActiveStorage rescue LoadError logger.info "Skipping image analysis because the mini_magick gem isn't installed" {} + rescue MiniMagick::Error => error + logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}" + {} end def rotated_image?(image) |