mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 03:59:50 +08:00
FIX: fix_missing_s3
task fails on failed upload (take 2) (#13660)
ref: 935aadbfdd
This commit is contained in:
parent
935aadbfdd
commit
236d6d91b2
|
@ -1037,10 +1037,17 @@ def fix_missing_s3
|
|||
else
|
||||
# we do not fix sha, it may be wrong for arbitrary reasons, if we correct it
|
||||
# we may end up breaking posts
|
||||
upload.assign_attributes(etag: fixed_upload.etag, url: fixed_upload.url, verification_status: Upload.verification_statuses[:unchecked])
|
||||
saved = upload.save(validate: false)
|
||||
save_error = nil
|
||||
begin
|
||||
upload.assign_attributes(etag: fixed_upload.etag, url: fixed_upload.url, verification_status: Upload.verification_statuses[:unchecked])
|
||||
upload.save!(validate: false)
|
||||
rescue => save_error
|
||||
# url might be null
|
||||
end
|
||||
|
||||
if saved
|
||||
if save_error
|
||||
puts "Failed to save upload #{saved.errors.full_messages}"
|
||||
else
|
||||
OptimizedImage.where(upload_id: upload.id).destroy_all
|
||||
rebake_ids = PostUpload.where(upload_id: upload.id).pluck(:post_id)
|
||||
|
||||
|
@ -1050,8 +1057,6 @@ def fix_missing_s3
|
|||
post.rebake!
|
||||
end
|
||||
end
|
||||
else
|
||||
puts "Failed to save upload #{saved.errors.full_messages}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user