Merge pull request #106 from camptocamp/revert-101-13.0-monitoring_check_db_connection

Revert "[13.0] [IMP] monitoring_status: check the db is reachable"
This commit is contained in:
Guewen Baconnier
2019-11-18 14:45:09 +01:00
committed by GitHub
co-authored by GitHub
2 changed files with 2 additions and 21 deletions
+1 -20
View File
@@ -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)