From e4f56fa94217061b25f3a8f45d17c8657ca9c56d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 Nov 2016 23:16:34 +0100
Subject: [PATCH] Don't create attachments if remote file cannot be fetched
---
app/models/media_attachment.rb | 2 --
app/services/process_feed_service.rb | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index d3e3d73be..bfbf00d76 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -22,8 +22,6 @@ class MediaAttachment < ApplicationRecord
def file_remote_url=(url)
self.file = URI.parse(url)
- rescue OpenURI::HTTPError => e
- Rails.logger.debug "Error fetching remote attachment: #{e}"
end
def image?
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 561feb032..08c66c904 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -173,7 +173,7 @@ class ProcessFeedService < BaseService
begin
media.file_remote_url = link['href']
media.save
- rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+ rescue OpenURI::HTTPError, Paperclip::Errors::NotIdentifiedByImageMagickError
next
end
end