Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: pull hotlinked images job wasn't properly handling the InvalidParameters exception

This commit is contained in:
Régis Hanol 2014-04-22 15:32:48 +02:00
parent 005f2023a2
commit 5fd4d88491
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/jobs/regular/pull_hotlinked_images.rb
View File

@ -31,7 +31,10 @@ module Jobs
begin begin
# have we already downloaded that file? # have we already downloaded that file?
if !downloaded_urls.include?(src) if !downloaded_urls.include?(src)
hotlinked = FileHelper.download(src, @max_size, "discourse-hotlinked") rescue Discourse::InvalidParameters begin
hotlinked = FileHelper.download(src, @max_size, "discourse-hotlinked")
rescue Discourse::InvalidParameters
end
if hotlinked.try(:size) <= @max_size if hotlinked.try(:size) <= @max_size
filename = File.basename(URI.parse(src).path) filename = File.basename(URI.parse(src).path)
upload = Upload.create_for(post.user_id, hotlinked, filename, hotlinked.size, { origin: src }) upload = Upload.create_for(post.user_id, hotlinked, filename, hotlinked.size, { origin: src })