From 94123513156f60ca91ac06045f40b6bc95f74238 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 20 Feb 2013 12:53:37 +0100
Subject: [PATCH 1/2] [IMP] Only unhandled exceptions are logged to the console
 by the netsvc layer.

bzr revid: vmt@openerp.com-20130220115337-6319hshm4vfwlr1o
---
 openerp/netsvc.py        | 4 ++++
 openerp/osv/orm.py       | 1 -
 openerp/service/model.py | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

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

From e2e9c0669e296e84b9b57211c43375482dd1afe1 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Mon, 25 Feb 2013 16:20:57 +0100
Subject: [PATCH 2/2] [IMP] osv: removed unnecessary `except` clauses.

bzr revid: vmt@openerp.com-20130225152057-9ehnwo2szr4pphz3
---
 openerp/service/model.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openerp/service/model.py b/openerp/service/model.py
index 1eb2b6e10f8..976af76bc93 100644
--- a/openerp/service/model.py
+++ b/openerp/service/model.py
@@ -98,8 +98,6 @@ def check(f):
             if openerp.pooler.get_pool(dbname)._init:
                 raise openerp.exceptions.Warning('Currently, this database is not fully loaded and can not be used.')
             return f(dbname, *args, **kwargs)
-        except except_orm:
-            raise
         except IntegrityError, inst:
             osv_pool = openerp.pooler.get_pool(dbname)
             for key in osv_pool._sql_error.keys():
@@ -127,8 +125,6 @@ def check(f):
                 raise openerp.osv.orm.except_orm(_('Integrity Error'), msg)
             else:
                 raise openerp.osv.orm.except_orm(_('Integrity Error'), inst[0])
-        except Exception:
-            raise
 
     return wrapper