Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated a logic of fetching of task from queue

This commit is contained in:
Vokhmin Alexey V 2014-12-11 00:15:41 +03:00
parent c8db1109d3
commit 4e09827f8d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/build_list.rb
View File

@ -618,12 +618,16 @@ class BuildList < ActiveRecord::Base
def self.next_build_from_queue(kind_id, key, arch_ids, platform_ids, mass_build = false)
if kind_id && (arch_ids.present? || platform_ids.present?)
build_list = BuildList.where(user_id: kind_id).
scoped_to_arch(arch_ids).
scope = BuildList.scoped_to_arch(arch_ids).
for_status([BuildList::BUILD_PENDING, BuildList::RERUN_TESTS]).
for_platform(platform_ids)
build_list = build_list.where.not(mass_build_id: nil) if mass_build
build_list = build_list.oldest.order(:created_at).first
scope =
if mass_build
scope.where(mass_build_id: kind_id)
else
scope.where(user_id: kind_id, mass_build_id: nil)
end
build_list = scope.oldest.order(:created_at).first
build_list = nil if build_list && build_list.destroy_from_resque_queue != 1
elsif key