From 2d2e7aa528d549d0cb7dd84161b9600d2236eb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Ko=CC=88tte?= Date: Thu, 21 Jan 2016 13:11:18 +0100 Subject: [PATCH] fix job enqueueing --- lib/travis/api/v3/models/cron.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/travis/api/v3/models/cron.rb b/lib/travis/api/v3/models/cron.rb index 47eebed5..ba792b6b 100644 --- a/lib/travis/api/v3/models/cron.rb +++ b/lib/travis/api/v3/models/cron.rb @@ -4,9 +4,16 @@ module Travis::API::V3 belongs_to :branch def self.start_all + started = [] + self.all.each do |cron| - cron.start if cron.next_build_time <= Time.now + if cron.next_build_time <= Time.now + cron.start + started.push cron + end end + + started end def start @@ -14,11 +21,11 @@ module Travis::API::V3 payload = { repository: { id: branch.repository.github_id, owner_name: branch.repository.owner_name, name: branch.repository.name }, - user: { id: user.id }, - branch: branch + branch: branch.name } - perform_async(:build_request, type: 'cron'.freeze, payload: JSON.dump(payload)) + class_name, queue = Query.sidekiq_queue(:build_request) + ::Sidekiq::Client.push('queue'.freeze => queue, 'class'.freeze => class_name, 'args'.freeze => [{type: 'cron'.freeze, payload: JSON.dump(payload)}]) payload end