From 4e78abb537f794d5dbe503f7eee08a13234882c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 11 Oct 2017 23:11:44 +0200
Subject: [PATCH] let's try 3 times to download images locally

---
 app/jobs/regular/pull_hotlinked_images.rb | 42 +++++++++++++----------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index a1c0aa7b62..fc2ffe3901 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -9,10 +9,31 @@ module Jobs
     sidekiq_options queue: 'low'
 
     def initialize
-      # maximum size of the file in bytes
       @max_size = SiteSetting.max_image_size_kb.kilobytes
     end
 
+    def download(src)
+      downloaded = nil
+
+      begin
+        retries ||= 3
+
+        downloaded = FileHelper.download(
+          src,
+          max_file_size: @max_size,
+          tmp_file_name: "discourse-hotlinked",
+          follow_redirect: true
+        )
+      rescue
+        if (retries -= 1) > 0
+          sleep 1
+          retry
+        end
+      end
+
+      downloaded
+    end
+
     def execute(args)
       return unless SiteSetting.download_remote_images_to_local?
 
@@ -32,23 +53,10 @@ module Jobs
         src = "http:#{src}" if src.start_with?("//")
 
         if is_valid_image_url(src)
-          hotlinked = nil
           begin
             # have we already downloaded that file?
             unless downloaded_urls.include?(src)
-              begin
-                hotlinked = FileHelper.download(
-                  src,
-                  max_file_size: @max_size,
-                  tmp_file_name: "discourse-hotlinked",
-                  follow_redirect: true
-                )
-              rescue Discourse::InvalidParameters
-                log(:error, "InvalidParameters while downloading hotlinked image (#{src}) for post: #{post_id}")
-              rescue => e
-                log(:error, "Failed to download image #{e}")
-              end
-              if hotlinked
+              if hotlinked = download(src)
                 if File.size(hotlinked.path) <= @max_size
                   filename = File.basename(URI.parse(src).path)
                   filename << File.extname(hotlinked.path) unless filename["."]
@@ -56,14 +64,12 @@ module Jobs
                   if upload.persisted?
                     downloaded_urls[src] = upload.url
                   else
-                    log(:error, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.join("\n")}")
+                    log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.join("\n")}")
                   end
                 else
-                  log(:error, "Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}")
                   large_images << original_src
                 end
               else
-                log(:error, "There was an error while downloading '#{src}' locally for post: #{post_id}")
                 broken_images << original_src
               end
             end