diff options
Diffstat (limited to 'odoo/service/wsgi_server.py')
| -rw-r--r-- | odoo/service/wsgi_server.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/odoo/service/wsgi_server.py b/odoo/service/wsgi_server.py index afcac829856..46c589157c1 100644 --- a/odoo/service/wsgi_server.py +++ b/odoo/service/wsgi_server.py @@ -85,17 +85,12 @@ def xmlrpc_handle_exception_int(e): fault = xmlrpclib.Fault(RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info) response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) else: - if hasattr(e, 'message') and e.message == 'AccessDenied': # legacy - fault = xmlrpclib.Fault(RPC_FAULT_CODE_ACCESS_DENIED, str(e)) - response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) - #InternalError - else: - info = sys.exc_info() - # Which one is the best ? - formatted_info = "".join(traceback.format_exception(*info)) - #formatted_info = odoo.tools.exception_to_unicode(e) + '\n' + info - fault = xmlrpclib.Fault(RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info) - response = xmlrpclib.dumps(fault, allow_none=None, encoding=None) + info = sys.exc_info() + # Which one is the best ? + formatted_info = "".join(traceback.format_exception(*info)) + #formatted_info = odoo.tools.exception_to_unicode(e) + '\n' + info + fault = xmlrpclib.Fault(RPC_FAULT_CODE_APPLICATION_ERROR, formatted_info) + response = xmlrpclib.dumps(fault, allow_none=None, encoding=None) return response def xmlrpc_handle_exception_string(e): @@ -116,7 +111,7 @@ def xmlrpc_handle_exception_string(e): elif isinstance(e, odoo.exceptions.DeferredException): info = e.traceback formatted_info = "".join(traceback.format_exception(*info)) - fault = xmlrpclib.Fault(odoo.tools.ustr(e.message), formatted_info) + fault = xmlrpclib.Fault(odoo.tools.ustr(e), formatted_info) response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) #InternalError else: |