github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 22:05:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Add 'backfill_etags_' to the method name since it also backfilling the etags

Browse Source
This commit is contained in:
Vinoth Kannan 2019-02-19 21:54:35 +05:30
parent 7878e5007a
commit 563b953224
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/file_store/s3_store.rb
View File

@ -126,8 +126,8 @@ module FileStore
def list_missing_uploads(skip_optimized: false) def list_missing_uploads(skip_optimized: false)
if SiteSetting.enable_s3_inventory if SiteSetting.enable_s3_inventory
require 's3_inventory' require 's3_inventory'
S3Inventory.new(s3_helper, :upload).list_missing S3Inventory.new(s3_helper, :upload).backfill_etags_and_list_missing
S3Inventory.new(s3_helper, :optimized).list_missing unless skip_optimized S3Inventory.new(s3_helper, :optimized).backfill_etags_and_list_missing unless skip_optimized
else else
list_missing(Upload, "original/") list_missing(Upload, "original/")
list_missing(OptimizedImage, "optimized/") unless skip_optimized list_missing(OptimizedImage, "optimized/") unless skip_optimized

2
lib/s3_inventory.rb
View File

@ -24,7 +24,7 @@ class S3Inventory
end end
end end
def list_missing def backfill_etags_and_list_missing
if files.blank? if files.blank?
error("Failed to list inventory from S3") error("Failed to list inventory from S3")
return return

6
spec/components/s3_inventory_spec.rb
View File

@ -51,7 +51,7 @@ describe "S3Inventory" do
it "should raise error if an inventory file is not found" do it "should raise error if an inventory file is not found" do
client.stub_responses(:list_objects, contents: []) client.stub_responses(:list_objects, contents: [])
output = capture_stdout { inventory.list_missing } output = capture_stdout { inventory.backfill_etags_and_list_missing }
expect(output).to eq("Failed to list inventory from S3\n") expect(output).to eq("Failed to list inventory from S3\n")
end end
@ -70,7 +70,7 @@ describe "S3Inventory" do
inventory.expects(:inventory_date).returns(Time.now) inventory.expects(:inventory_date).returns(Time.now)
output = capture_stdout do output = capture_stdout do
inventory.list_missing inventory.backfill_etags_and_list_missing
end end
expect(output).to eq("#{upload.url}\n1 of 4 uploads are missing\n") expect(output).to eq("#{upload.url}\n1 of 4 uploads are missing\n")
@ -88,7 +88,7 @@ describe "S3Inventory" do
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(2) inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(2)
output = capture_stdout do output = capture_stdout do
expect { inventory.list_missing }.to change { Upload.where(etag: nil).count }.by(-2) expect { inventory.backfill_etags_and_list_missing }.to change { Upload.where(etag: nil).count }.by(-2)
end end
expect(Upload.order(:url).pluck(:url, :etag)).to eq(files) expect(Upload.order(:url).pluck(:url, :etag)).to eq(files)