From 8df3997a92bffa2d29f3c559933a336b837cdb93 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Sun, 7 May 2017 22:35:56 +0000 Subject: Add Pipeline Schedules that supersedes experimental Trigger Schedule --- app/workers/pipeline_schedule_worker.rb | 19 +++++++++++++++++++ app/workers/trigger_schedule_worker.rb | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 app/workers/pipeline_schedule_worker.rb delete mode 100644 app/workers/trigger_schedule_worker.rb (limited to 'app/workers') diff --git a/app/workers/pipeline_schedule_worker.rb b/app/workers/pipeline_schedule_worker.rb new file mode 100644 index 00000000000..a449a765f7b --- /dev/null +++ b/app/workers/pipeline_schedule_worker.rb @@ -0,0 +1,19 @@ +class PipelineScheduleWorker + include Sidekiq::Worker + include CronjobQueue + + def perform + Ci::PipelineSchedule.active.where("next_run_at < ?", Time.now).find_each do |schedule| + begin + Ci::CreatePipelineService.new(schedule.project, + schedule.owner, + ref: schedule.ref) + .execute(save_on_errors: false, schedule: schedule) + rescue => e + Rails.logger.error "#{schedule.id}: Failed to create a scheduled pipeline: #{e.message}" + ensure + schedule.schedule_next_run! + end + end + end +end diff --git a/app/workers/trigger_schedule_worker.rb b/app/workers/trigger_schedule_worker.rb deleted file mode 100644 index 9c1baf7e6c5..00000000000 --- a/app/workers/trigger_schedule_worker.rb +++ /dev/null @@ -1,18 +0,0 @@ -class TriggerScheduleWorker - include Sidekiq::Worker - include CronjobQueue - - def perform - Ci::TriggerSchedule.active.where("next_run_at < ?", Time.now).find_each do |trigger_schedule| - begin - Ci::CreateTriggerRequestService.new.execute(trigger_schedule.project, - trigger_schedule.trigger, - trigger_schedule.ref) - rescue => e - Rails.logger.error "#{trigger_schedule.id}: Failed to trigger_schedule job: #{e.message}" - ensure - trigger_schedule.schedule_next_run! - end - end - end -end -- cgit v1.2.3