75a1046315
Follow-up of #5953. Refactor the concerns with two goals: - Getting closer from the way ActiveStorage adds its own hooks. Usually ActiveStorage does this using an `Attachment#after_create` hook, which then delegates to the blob to enqueue the job. - Enqueuing each job only once. By hooking on `Attachment#after_create`, we guarantee each job will be added only once. We then let the jobs themselves check if they are relevant or not, and retry or discard themselves if necessary. We also need to update the tests a bit, because Rails' `perform_enqueued_jobs(&block)` test helper doesn't honor the `retry_on` clause of jobs. Instead it forwards the exception to the caller – which makes the test fail. Instead we use the inline version of `perform_enqueued_jobs()`, without a block, which properly ignores errors catched by retry_on.
21 lines
372 B
Ruby
21 lines
372 B
Ruby
module BlobVirusScannerConcern
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
before_create :set_pending
|
|
end
|
|
|
|
def virus_scanner
|
|
ActiveStorage::VirusScanner.new(self)
|
|
end
|
|
|
|
def scan_for_virus_later
|
|
VirusScannerJob.perform_later(self)
|
|
end
|
|
|
|
private
|
|
|
|
def set_pending
|
|
metadata[:virus_scan_result] ||= ActiveStorage::VirusScanner::PENDING
|
|
end
|
|
end
|