NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: fix monitoring routes

Browse Source
This commit is contained in:
Xavier-Do 2020-01-15 11:53:10 +01:00
parent 8cc82b7dde
commit c7fccf3b56
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runbot/controllers/frontend.py
View File

@ -290,24 +290,24 @@ class Runbot(Controller):
} }
return request.render("runbot.glances", qctx) return request.render("runbot.glances", qctx)
@route('/runbot/monitoring', type='http', auth='user', website=True) @route(['/runbot/monitoring',
@route('/runbot/monitoring/<int:config_id>', type='http', auth='user', website=True) '/runbot/monitoring/<int:config_id>',
@route('/runbot/monitoring/<int:config_id>/<int:view_id>', type='http', auth='user', website=True) '/runbot/monitoring/<int:config_id>/<int:view_id>'], type='http', auth='user', website=True)
def monitoring(self, config_id=None, view_id=None, refresh=None): def monitoring(self, config_id=None, view_id=None, refresh=None):
glances_ctx = self._glances_ctx() glances_ctx = self._glances_ctx()
pending = self._pending() pending = self._pending()
hosts_data = request.env['runbot.host'].search([]) hosts_data = request.env['runbot.host'].search([])
last_monitored = None last_monitored = None
if config_id or config_id is None:
monitored_config_id = config_id or int(request.env['ir.config_parameter'].sudo().get_param('runbot.monitored_config_id', 1)) monitored_config_id = config_id or int(request.env['ir.config_parameter'].sudo().get_param('runbot.monitored_config_id', 1))
request.env.cr.execute("""SELECT DISTINCT ON (branch_id) branch_id, id FROM runbot_build request.env.cr.execute("""SELECT DISTINCT ON (branch_id) branch_id, id FROM runbot_build
WHERE config_id = %s WHERE config_id = %s
AND global_state in ('running', 'done') AND global_state in ('running', 'done')
AND branch_id in (SELECT id FROM runbot_branch where sticky='t') AND branch_id in (SELECT id FROM runbot_branch where sticky='t')
AND local_state != 'duplicate' AND local_state != 'duplicate'
ORDER BY branch_id ASC, id DESC""", [int(monitored_config_id)]) ORDER BY branch_id ASC, id DESC""", [int(monitored_config_id)])
last_monitored = request.env['runbot.build'].browse([r[1] for r in request.env.cr.fetchall()]) last_monitored = request.env['runbot.build'].browse([r[1] for r in request.env.cr.fetchall()])
config = request.env['runbot.build.config'].browse(monitored_config_id) config = request.env['runbot.build.config'].browse(monitored_config_id)
qctx = { qctx = {
@ -321,7 +321,7 @@ class Runbot(Controller):
'auto_tags': request.env['runbot.build.error'].disabling_tags(), 'auto_tags': request.env['runbot.build.error'].disabling_tags(),
'build_errors': request.env['runbot.build.error'].search([('random', '=', True)]) 'build_errors': request.env['runbot.build.error'].search([('random', '=', True)])
} }
return request.render(request.env['ir.ui.view'].browse('view_id') if view_id else config.monitoring_view_id.id or "runbot.monitoring", qctx) return request.render(view_id if view_id else config.monitoring_view_id.id or "runbot.monitoring", qctx)
@route(['/runbot/branch/<int:branch_id>', '/runbot/branch/<int:branch_id>/page/<int:page>'], website=True, auth='public', type='http') @route(['/runbot/branch/<int:branch_id>', '/runbot/branch/<int:branch_id>/page/<int:page>'], website=True, auth='public', type='http')
def branch_builds(self, branch_id=None, search='', page=1, limit=50, refresh='', **kwargs): def branch_builds(self, branch_id=None, search='', page=1, limit=50, refresh='', **kwargs):