#312: small fixes, updated count of tasks in queue
This commit is contained in:
parent
ed94a85a64
commit
9735737902
|
@ -28,7 +28,11 @@
|
|||
.table
|
||||
.lefter= t("layout.build_lists.build_server_status.publish_workers")
|
||||
.both
|
||||
- [:workers, :tasks, :build_tasks].each do |metric|
|
||||
.table
|
||||
.lefter= t("layout.build_lists.build_server_status.amount")
|
||||
.righter= "{{server_status.publish.workers}}"
|
||||
.both
|
||||
- [:tasks, :build_tasks].each do |metric|
|
||||
.table
|
||||
.lefter= t("layout.build_lists.build_server_status.#{metric}")
|
||||
.righter= "{{server_status.publish.#{metric}}}"
|
||||
|
|
|
@ -9,6 +9,9 @@ module AbfWorker
|
|||
result[:rpm][:workers] += nodes[:systems]
|
||||
result[:rpm][:build_tasks] += nodes[:busy]
|
||||
result[:rpm][:other_workers] = nodes[:others]
|
||||
external_bls = BuildList.for_status(BuildList::BUILD_PENDING).external_nodes(:everything).count
|
||||
result[:rpm][:default_tasks] += external_bls
|
||||
result[:rpm][:tasks] += external_bls
|
||||
result
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue