From 27f1630b01aed0dfc32b617d9c599d7b43964350 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Wed, 19 Jan 2022 11:05:58 +0100
Subject: [PATCH] DEV: Try to download missing uploads from origin URL (#15629)
---
lib/tasks/uploads.rake | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 4a043ca1517..00079e05930 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -1010,15 +1010,26 @@ def fix_missing_s3
next if !upload
tempfile = nil
+ downloaded_from = nil
begin
tempfile = FileHelper.download(upload.url, max_file_size: 30.megabyte, tmp_file_name: "#{SecureRandom.hex}.#{upload.extension}")
+ downloaded_from = upload.url
rescue => e
- puts "Failed to download #{upload.url} #{e}"
+ if upload.origin.present?
+ begin
+ tempfile = FileHelper.download(upload.origin, max_file_size: 30.megabyte, tmp_file_name: "#{SecureRandom.hex}.#{upload.extension}")
+ downloaded_from = upload.origin
+ rescue => e
+ puts "Failed to download #{upload.origin} #{e}"
+ end
+ else
+ puts "Failed to download #{upload.url} #{e}"
+ end
end
if tempfile
- puts "Successfully downloaded upload id: #{upload.id} - #{upload.url} fixing upload"
+ puts "Successfully downloaded upload id: #{upload.id} - #{downloaded_from} fixing upload"
fixed_upload = nil
fix_error = nil