Get dashboard working and upgrade bootstrap. Note: the bootstrap fixes will be coming in the followup CL

This commit is contained in:
Joseph Schorr 2015-02-17 19:15:54 -05:00
parent 79f39697fe
commit 524705b88c
18 changed files with 429 additions and 260 deletions

View file

@ -70,7 +70,8 @@ class BuilderServer(object):
@controller_app.route('/status')
def status():
(running_count, available_count) = server._queue.get_metrics()
metrics = server._queue.get_metrics(require_transaction=False)
(running_count, available_not_running_count, available_count) = metrics
workers = [component for component in server._current_components
if component.kind() == 'builder']
@ -80,7 +81,7 @@ class BuilderServer(object):
'running_local': server._job_count,
'running_total': running_count,
'workers': len(workers),
'job_total': available_count
'job_total': available_count + running_count
}
return json.dumps(data)