odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] http.py: no traceback for SessionExpiredException 

Rebase and close #3618
This commit is contained in:
Mack 2014-11-11 22:26:33 +08:00 committed by Christophe Simonis
parent bc24d1b010
commit ffda023295
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openerp/http.py
View File

@ -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):