From 535c658b70737654ed5f48ca11b28cca953d1d77 Mon Sep 17 00:00:00 2001 From: Jordi Riera Date: Mon, 11 Feb 2019 17:46:04 -0500 Subject: [PATCH] monitorin_log_request: _dispatch is a classmethod --- monitoring_log_requests/__manifest__.py | 5 ++--- monitoring_log_requests/models/ir_http.py | 26 +++++++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/monitoring_log_requests/__manifest__.py b/monitoring_log_requests/__manifest__.py index 4d398c0..36e5ebb 100644 --- a/monitoring_log_requests/__manifest__.py +++ b/monitoring_log_requests/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) {'name': 'Monitoring: Requests Logging', - 'version': '11.0.1.0.0', - 'author': 'Camptocamp,Odoo Community Association (OCA)', + 'version': '11.0.2.0.0', + 'author': 'Camptocamp,Numigi,Odoo Community Association (OCA)', 'license': 'AGPL-3', 'category': 'category', 'depends': ['base', 'web'], diff --git a/monitoring_log_requests/models/ir_http.py b/monitoring_log_requests/models/ir_http.py index 007c31b..a1171c7 100644 --- a/monitoring_log_requests/models/ir_http.py +++ b/monitoring_log_requests/models/ir_http.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) @@ -17,26 +16,30 @@ _logger = logging.getLogger('monitoring.http.requests') class IrHttp(models.AbstractModel): _inherit = 'ir.http' - def _dispatch(self): + @classmethod + def _dispatch(cls): begin = time.time() - response = super(IrHttp, self)._dispatch() + response = super(IrHttp, cls)._dispatch() end = time.time() - if (not self._monitoring_blacklist(http_request) and - self._monitoring_filter(http_request)): - info = self._monitoring_info(http_request, response, begin, end) - self._monitoring_log(info) + if (not cls._monitoring_blacklist(http_request) and + cls._monitoring_filter(http_request)): + info = cls._monitoring_info(http_request, response, begin, end) + cls._monitoring_log(info) return response - def _monitoring_blacklist(self, request): + @classmethod + def _monitoring_blacklist(cls, request): path_info = request.httprequest.environ.get('PATH_INFO') if path_info.startswith('/longpolling/'): return True return False - def _monitoring_filter(self, request): + @classmethod + def _monitoring_filter(cls, _): return True - def _monitoring_info(self, request, response, begin, end): + @classmethod + def _monitoring_info(cls, request, response, begin, end): path = request.httprequest.environ.get('PATH_INFO') info = { # timing @@ -75,5 +78,6 @@ class IrHttp(models.AbstractModel): }) return info - def _monitoring_log(self, info): + @classmethod + def _monitoring_log(cls, info): _logger.info(json.dumps(info))