Skip to content

Commit

Permalink
Fix pollable job cleanup logger name (#2583)
Browse files Browse the repository at this point in the history
* Rename logger to match class name
* Also rename local variables from "blob" to "job"
  • Loading branch information
jochenehret committed Dec 7, 2021
1 parent ed09b45 commit 27c7239
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions app/jobs/runtime/pollable_job_cleanup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ class PollableJobCleanup < VCAP::CloudController::Jobs::CCJob
CUTOFF_AGE_IN_DAYS = 90

def perform
old_orphaned_blobs = PollableJobModel.where(Sequel.lit("created_at < CURRENT_TIMESTAMP - INTERVAL '?' DAY", CUTOFF_AGE_IN_DAYS))
logger = Steno.logger('cc.background.expired-orphaned-blob-cleanup')
logger.info("Cleaning up #{old_orphaned_blobs.count} OrphanedBlob rows")
old_orphaned_blobs.delete
old_pollable_jobs = PollableJobModel.where(Sequel.lit("created_at < CURRENT_TIMESTAMP - INTERVAL '?' DAY", CUTOFF_AGE_IN_DAYS))
logger = Steno.logger('cc.background.pollable-job-cleanup')
logger.info("Cleaning up #{old_pollable_jobs.count} Jobs rows")
old_pollable_jobs.delete
end

def job_name_in_configuration
Expand Down
8 changes: 4 additions & 4 deletions spec/unit/jobs/runtime/pollable_job_cleanup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ module VCAP::CloudController
module Jobs::Runtime
RSpec.describe PollableJobCleanup, job_context: :worker do
subject(:job) { PollableJobCleanup.new }
let!(:old_blob) { PollableJobModel.create(created_at: 91.days.ago) }
let!(:new_blob) { PollableJobModel.create(created_at: 1.days.ago) }
let!(:old_job) { PollableJobModel.create(created_at: 91.days.ago) }
let!(:new_job) { PollableJobModel.create(created_at: 1.days.ago) }

it { is_expected.to be_a_valid_job }

it 'removes pollable jobs that are older than the specified cutoff age' do
job.perform
expect(PollableJobModel.find(guid: old_blob.guid)).to be_nil
expect(PollableJobModel.find(guid: old_job.guid)).to be_nil
end

it 'leaves the pollable jobs that are younger than the specified cutoff age' do
job.perform
expect(PollableJobModel.find(guid: new_blob.guid)).to eq(new_blob)
expect(PollableJobModel.find(guid: new_job.guid)).to eq(new_job)
end

it 'knows its job name' do
Expand Down

0 comments on commit 27c7239

Please sign in to comment.