From 0aca80e92ac3c85b5d76a668dfd694e5fa753393 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 10 Sep 2018 15:16:29 +0800 Subject: [PATCH] Fixes to `uploads:list_posts_with_broken_images`. --- lib/tasks/uploads.rake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake index 7d12991443d..19473582c6f 100644 --- a/lib/tasks/uploads.rake +++ b/lib/tasks/uploads.rake @@ -718,10 +718,10 @@ end task "uploads:list_posts_with_broken_images" => :environment do if ENV["RAILS_DB"] - list_broken_posts(recover_from_s3: ENV["RECOVER_MISSING"]) + list_broken_posts(recover_from_s3: ENV["RECOVER_FROM_S3"]) else RailsMultisite::ConnectionManagement.each_connection do |db| - list_broken_posts(recover_from_s3: ENV["RECOVER_MISSING"]) + list_broken_posts(recover_from_s3: ENV["RECOVER_FROM_S3"]) end end end @@ -781,12 +781,14 @@ def recover_from_s3_by_sha1(post:, sha1:, object_keys: []) tmp_file_name: "recover_from_s3" ) - upload = UploadCreator.new( - tmp, - File.basename(key) - ).create_for(post.user_id) + if tmp + upload = UploadCreator.new( + tmp, + File.basename(key) + ).create_for(post.user_id) - post.rebake! if upload.persisted? + post.rebake! if upload.persisted? + end ensure tmp&.close end