[MERGE] Merged from openobject-addons.

bzr revid: jra@tinyerp.com-20120627075508-kko9c9dr67695hzw

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d09d2cc86d5..03b2dcc47bf 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -22,10 +22,10 @@
 
 from osv import osv, fields
 from osv.orm import except_orm
-
+import logging
 import nodes
 from tools.translate import _
-
+_logger = logging.getLogger(__name__)
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
@@ -78,9 +78,8 @@ class document_directory(osv.osv):
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
         except Exception, e:
-            import netsvc
-            logger = netsvc.Logger()
-            logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
+            
+            _logger.warning('Cannot set directory root:'+ str(e))
             return False
         return objid.browse(cr, uid, mid, context=context).res_id