Skip to content

Commit 0d18682

Browse files
committed
remove unwanted rescue
1 parent 94cb65b commit 0d18682

File tree

3 files changed

+122
-271
lines changed

3 files changed

+122
-271
lines changed

app/jobs/bulk_zombie_url_uploader_job.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ def report_results
2020

2121
def log_results
2222
results = @uploader.results
23-
Rails.logger.info "BulkZombieUrlUploaderJob: #{results.file_name}"
24-
Rails.logger.info " #{results.total_count} URLs"
25-
Rails.logger.info " #{results.error_count} errors"
23+
Rails.logger.info(BulkZombieUrlUploaderJob: results.file_name, total_urls: results.total_count, errors: results.error_count)
2624
end
2725

2826
def send_results_email

app/services/bulk_zombie_url_uploader.rb

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,7 @@ def initialize_results
2828
end
2929

3030
def process_upload
31-
parse_csv.each { |row| process_row(row) }
32-
rescue CSV::MalformedCSVError => e
33-
handle_csv_error(e)
34-
end
35-
36-
def parse_csv
37-
csv = CSV.parse(File.read(@file_path), headers: true)
38-
raise CSV::MalformedCSVError, "Missing required headers" unless %w[URL DOC_ID].all? { |col| csv.headers.include?(col) }
39-
csv
40-
rescue CSV::MalformedCSVError, ArgumentError => e
41-
raise CSV::MalformedCSVError.new('CSV', "Malformed or invalid CSV: #{e.message}")
31+
CSV.parse(File.read(@file_path), headers: true).each { |row| process_row(row) }
4232
end
4333

4434
def process_row(row)
@@ -53,7 +43,7 @@ def process_row(row)
5343
end
5444

5545
def handle_url_processing(url, document_id, row)
56-
process_url_with_rescue(url, document_id)
46+
process_url(url, document_id)
5747
update_results
5848
rescue StandardError => e
5949
handle_processing_error(e, url, document_id, row)
@@ -69,26 +59,15 @@ def log_missing_document_id(row, url)
6959
Rails.logger.error("Skipping row: #{row.inspect}. Document ID is mandatory.")
7060
end
7161

72-
def handle_csv_error(error)
73-
@results.add_error('Invalid CSV format', 'Entire file')
74-
Rails.logger.error("Error parsing CSV: #{error.message}")
75-
end
76-
7762
def log_upload_error(error)
7863
error_message = "Failed to process bulk zombie URL document (file: #{@file_name})."
79-
backtrace = error.backtrace ? error.backtrace.join("\n") : 'No backtrace available'
80-
Rails.logger.error("#{error_message} Error: #{error.message}\n#{backtrace}")
64+
Rails.logger.error(error_message, error)
8165
end
8266

8367
def handle_processing_error(error, url, document_id, row)
8468
key = url.presence || document_id
8569
@results&.add_error(error.message, key)
86-
backtrace = error.backtrace ? error.backtrace.join("\n") : 'No backtrace available'
87-
Rails.logger.error("Failure to process bulk upload zombie URL row: #{row.inspect}\n#{error.message}\n#{backtrace}")
88-
end
89-
90-
def process_url_with_rescue(url, document_id)
91-
process_url(url, document_id)
70+
Rails.logger.error('Failure to process bulk upload zombie URL row:', error)
9271
end
9372

9473
def process_url(url, document_id)

0 commit comments

Comments
 (0)