From 8ecd50b2936a42e0d261a8ca54ae7b1e02c2bafc Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 29 Oct 2019 17:32:32 +0100 Subject: [PATCH] Revert "[12.0] [IMP] monitoring_status: check the db is reachable" --- monitoring_status/controllers/main.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/monitoring_status/controllers/main.py b/monitoring_status/controllers/main.py index d6b0cdc..b95c2ab 100644 --- a/monitoring_status/controllers/main.py +++ b/monitoring_status/controllers/main.py @@ -4,12 +4,9 @@ import logging import json -import psycopg2 - import werkzeug from odoo import http -from odoo.http import request from odoo.addons.web.controllers.main import ensure_db @@ -33,24 +30,10 @@ class Monitoring(http.Controller): @http.route('/monitoring/status', type='http', auth='none') def status(self): ensure_db() - http_status = 200 # TODO: add 'sub-systems' status and infos: # queue job, cron, database, ... headers = {'Content-Type': 'application/json'} info = {'status': 1} - # check the database connection - try: - cr = request.env.cr - cr.execute( - 'SELECT value ' - 'FROM ir_config_parameter ' - 'WHERE key=%s', - ('web.base.url',)) - result = cr.fetchone() - info['web.base.url'] = result or '' - except psycopg2.OperationalError as exc: - info['database_error'] = str(exc) - http_status = 503 session = http.request.session # We set a custom expiration of 1 second for this request, as we do a # lot of health checks, we don't want those anonymous sessions to be @@ -60,6 +43,4 @@ class Monitoring(http.Controller): # Redis. if not session.uid: session.expiration = 1 - return werkzeug.wrappers.Response( - json.dumps(info), status=http_status, headers=headers - ) + return werkzeug.wrappers.Response(json.dumps(info), headers=headers)