From ffda02329595faf38dd6fb337217fd28772ba565 Mon Sep 17 00:00:00 2001 From: Mack Date: Tue, 11 Nov 2014 22:26:33 +0800 Subject: [PATCH] [FIX] http.py: no traceback for SessionExpiredException Rebase and close #3618 --- openerp/http.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp/http.py b/openerp/http.py index 343520433ea..eddbcb669a3 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -516,16 +516,19 @@ class JsonRequest(WebRequest): try: return super(JsonRequest, self)._handle_exception(exception) except Exception: - if not isinstance(exception, openerp.exceptions.Warning): + if not isinstance(exception, (openerp.exceptions.Warning, SessionExpiredException)): _logger.exception("Exception during JSON request handling.") error = { 'code': 200, - 'message': "OpenERP Server Error", + 'message': "Odoo Server Error", 'data': serialize_exception(exception) } if isinstance(exception, AuthenticationError): error['code'] = 100 - error['message'] = "OpenERP Session Invalid" + error['message'] = "Odoo Session Invalid" + if isinstance(exception, SessionExpiredException): + error['code'] = 100 + error['message'] = "Odoo Session Expired" return self._json_response(error=error) def dispatch(self):