From 336635f283eab06c561134f2147a3bd1983090e1 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Mon, 22 May 2017 20:22:50 +0200 Subject: Test the ExpireJobCacheWorker and related changes These were untested by the cherry picked commit. --- app/workers/expire_job_cache_worker.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'app/workers') diff --git a/app/workers/expire_job_cache_worker.rb b/app/workers/expire_job_cache_worker.rb index e3930ee9d41..08e281e7350 100644 --- a/app/workers/expire_job_cache_worker.rb +++ b/app/workers/expire_job_cache_worker.rb @@ -2,15 +2,17 @@ class ExpireJobCacheWorker include Sidekiq::Worker include BuildQueue - def perform(pipeline_id, job_id) - job = CommitStatus.joins(:pipeline, :project).find_by(id: job) + def perform(job_id) + job = CommitStatus.joins(:pipeline, :project).find_by(id: job_id) return unless job pipeline = job.pipeline project = job.project - store.touch(project_pipeline_path(project, pipeline)) - store.touch(project_job_path(project, job)) + Gitlab::EtagCaching::Store.new.tap do |store| + store.touch(project_pipeline_path(project, pipeline)) + store.touch(project_job_path(project, job)) + end end private @@ -30,8 +32,4 @@ class ExpireJobCacheWorker job.id, format: :json) end - - def store - @store ||= Gitlab::EtagCaching::Store.new - end end -- cgit v1.2.3