From d74ee9dbce7f006a02062f8c2e8196d3de0cd9f8 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Sat, 8 Jun 2019 18:36:06 +0530 Subject: [PATCH] DEV: skip S3 inventory records without correct multisite prefix. --- lib/s3_inventory.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/s3_inventory.rb b/lib/s3_inventory.rb index 83b64b25a8..19901765a2 100644 --- a/lib/s3_inventory.rb +++ b/lib/s3_inventory.rb @@ -34,13 +34,16 @@ class S3Inventory download_inventory_files_to_tmp_directory decompress_inventory_files + multisite_prefix = "uploads/#{RailsMultisite::ConnectionManagement.current_db}/" ActiveRecord::Base.transaction do begin connection.exec("CREATE TEMP TABLE #{table_name}(key text UNIQUE, etag text, PRIMARY KEY(etag, key))") connection.copy_data("COPY #{table_name} FROM STDIN CSV") do files.each do |file| CSV.foreach(file[:filename][0...-3], headers: false) do |row| - connection.put_copy_data("#{row[CSV_KEY_INDEX]},#{row[CSV_ETAG_INDEX]}\n") + key = row[CSV_KEY_INDEX] + next if Rails.configuration.multisite && key.exclude?(multisite_prefix) + connection.put_copy_data("#{key},#{row[CSV_ETAG_INDEX]}\n") end end end