diff --git a/openerp/netsvc.py b/openerp/netsvc.py index a5e33ff22b1..27851ae3f21 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -247,12 +247,16 @@ def dispatch_rpc(service_name, method, params): log(rpc_request,logging.DEBUG, logline, replace_request_password(params), depth=1) return result + except openerp.osv.orm.except_orm: + raise except openerp.exceptions.AccessError: raise except openerp.exceptions.AccessDenied: raise except openerp.exceptions.Warning: raise + except openerp.exceptions.RedirectWarning: + raise except openerp.exceptions.DeferredException, e: _logger.exception(tools.exception_to_unicode(e)) post_mortem(e.traceback) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index ebde4c17a51..10f5b52c6f6 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -59,7 +59,6 @@ from lxml import etree import fields import openerp -import openerp.netsvc as netsvc import openerp.tools as tools from openerp.tools.config import config from openerp.tools.misc import CountingStream diff --git a/openerp/service/model.py b/openerp/service/model.py index ac37264ae2f..1eb2b6e10f8 100644 --- a/openerp/service/model.py +++ b/openerp/service/model.py @@ -128,7 +128,6 @@ def check(f): else: raise openerp.osv.orm.except_orm(_('Integrity Error'), inst[0]) except Exception: - _logger.exception("Uncaught exception") raise return wrapper