Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-29 16:14:58 +0300
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-06 17:46:58 +0300
commit3d1bc4a44cf7197d3148d829c4f527e9afbf1ea6 (patch)
treeab3880e3c5a23b2cd318186fd958884adb0f96a9 /app/workers
parentc426763c42d41c9c0c9a9cfe544f3185eeaa984f (diff)
Fixed strcture for db change
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/trigger_schedule_worker.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/workers/trigger_schedule_worker.rb b/app/workers/trigger_schedule_worker.rb
index d55e9378e02..04a53a38adb 100644
--- a/app/workers/trigger_schedule_worker.rb
+++ b/app/workers/trigger_schedule_worker.rb
@@ -3,14 +3,15 @@ class TriggerScheduleWorker
include CronjobQueue
def perform
- Ci::TriggerSchedule.where("next_run_at < ?", Time.now).find_each do |trigger|
+ Ci::TriggerSchedule.where("next_run_at < ?", Time.now).find_each do |trigger_schedule|
begin
- Ci::CreatePipelineService.new(trigger.project, trigger.owner, ref: trigger.ref).
- execute(ignore_skip_ci: true, scheduled_trigger: true)
+ Ci::CreateTriggerRequestService.new.execute(trigger_schedule.trigger.project,
+ trigger_schedule.trigger,
+ trigger_schedule.trigger.ref)
rescue => e
- Rails.logger.error "#{trigger.id}: Failed to trigger job: #{e.message}"
+ Rails.logger.error "#{trigger_schedule.id}: Failed to trigger_schedule job: #{e.message}"
ensure
- trigger.schedule_next_run!
+ trigger_schedule.schedule_next_run!
end
end
end