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

#142: update text labels

This commit is contained in:
Vokhmin Alexey V 2013-05-24 12:47:35 +04:00
parent 40449c81ef
commit 3e861efe5f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/projects/build_lists/_server_status.html.haml
View File

@ -7,8 +7,8 @@
.lefter= t("layout.build_lists.build_server_status.rpm_workers") .lefter= t("layout.build_lists.build_server_status.rpm_workers")
.both .both
.table .table
.lefter= t("layout.build_lists.build_server_status.count") .lefter= t("layout.build_lists.build_server_status.workers")
.righter= @build_server_status[:rpm][:count] .righter= @build_server_status[:rpm][:workers]
.both .both
.table .table
.lefter= t("layout.build_lists.build_server_status.tasks") .lefter= t("layout.build_lists.build_server_status.tasks")
@ -27,7 +27,7 @@
.table .table
.lefter= t("layout.build_lists.build_server_status.#{queue}_workers") .lefter= t("layout.build_lists.build_server_status.#{queue}_workers")
.both .both
- [:count, :tasks, :build_tasks].each do |metric| - [:workers, :tasks, :build_tasks].each do |metric|
.table .table
.lefter= t("layout.build_lists.build_server_status.#{metric}") .lefter= t("layout.build_lists.build_server_status.#{metric}")
- if metric == :tasks - if metric == :tasks

8
config/locales/models/build_list.en.yml
View File

@ -99,14 +99,14 @@ en:
build_server_status: build_server_status:
header: Build server status header: Build server status
count: '- count' workers: '- count'
tasks: '- tasks in queue' tasks: '- tasks in queue'
user_tasks: "-- user's" user_tasks: "-- user's"
mass_build_tasks: "-- mass build's" mass_build_tasks: "-- mass build's"
build_tasks: '- tasks in execution' build_tasks: '- tasks in execution'
rpm_workers: Workers for building rpm_workers: Workers of building
iso_workers: Workers for building iso_workers: Workers of building
publish_workers: Workers for publishing publish_workers: Workers of publishing
items: items:
statuses: statuses:

8
config/locales/models/build_list.ru.yml
View File

@ -98,14 +98,14 @@ ru:
build_server_status: build_server_status:
header: Статус сборочного сервера header: Статус сборочного сервера
count: '- число' workers: '- число'
tasks: '- заданий в очереди' tasks: '- заданий в очереди'
user_tasks: '-- пользовательских' user_tasks: '-- пользовательских'
mass_build_tasks: '-- массовой сборки' mass_build_tasks: '-- массовой сборки'
build_tasks: '- заданий выполняется' build_tasks: '- заданий выполняется'
rpm_workers: Воркеров для сборки rpm_workers: Воркеры сборки
iso_workers: Воркеров для сборки iso_workers: Воркеры сборки
publish_workers: Воркеров для публикации publish_workers: Воркеры публикации
items: items:
statuses: statuses:

2
lib/abf_worker/status_inspector.rb
View File

@ -30,7 +30,7 @@ module AbfWorker
redis, key = Resque.redis, "queue:#{worker}_worker" redis, key = Resque.redis, "queue:#{worker}_worker"
default_tasks, tasks = redis.llen("#{key}_default"), redis.llen(key) default_tasks, tasks = redis.llen("#{key}_default"), redis.llen(key)
{ {
:count => workers.count, :workers => workers.count,
:build_tasks => workers.select{ |w| w.working? }.count, :build_tasks => workers.select{ |w| w.working? }.count,
:default_tasks => redis.llen("#{key}_default"), :default_tasks => redis.llen("#{key}_default"),
:low_tasks => redis.llen(key) :low_tasks => redis.llen(key)