Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-fix-server-log-document-kjo into
lp:~openerp-dev/openobject-addons/trunk-fix-server-log.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-server-log-document-kjo/+merge/110239
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fix-server-log-document-kjo/+merge/110239
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-fix-server-log.
=== modified file 'document/document_directory.py'
--- document/document_directory.py 2011-12-19 16:54:40 +0000
+++ document/document_directory.py 2012-06-14 06:26:21 +0000
@@ -78,9 +78,8 @@
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))
+ import logging
+ logging.getLogger('document').warning('Cannot set directory root:'+ str(e))
return False
return objid.browse(cr, uid, mid, context=context).res_id
=== modified file 'document_ftp/ftpserver/__init__.py'
--- document_ftp/ftpserver/__init__.py 2011-10-11 20:05:49 +0000
+++ document_ftp/ftpserver/__init__.py 2012-06-14 06:26:21 +0000
@@ -23,7 +23,7 @@
import ftpserver
import authorizer
import abstracted_fs
-import netsvc
+import logging
from tools import config
def start_server():
@@ -35,9 +35,6 @@
PASSIVE_PORTS = int(pps[0]), int(pps[1])
class ftp_server(threading.Thread):
- def log(self, level, message):
- logger = netsvc.Logger()
- logger.notifyChannel('FTP', level, message)
def run(self):
autho = authorizer.authorizer()
@@ -48,17 +45,17 @@
if PASSIVE_PORTS:
ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
- ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
+ ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg)
ftpserver.logline = lambda msg: None
- ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
+ ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg)
ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
ftpd.serve_forever()
if HOST.lower() == 'none':
- netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Server FTP Not Started\n")
+ logging.getLogger('document.ftp').info("\n Server FTP Not Started\n")
else:
- netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
+ logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
ds = ftp_server()
ds.daemon = True
ds.start()
=== modified file 'document_webdav/webdav_view.xml'
--- document_webdav/webdav_view.xml 2012-06-11 16:10:14 +0000
+++ document_webdav/webdav_view.xml 2012-06-14 06:26:21 +0000
@@ -77,7 +77,7 @@
<field name="inherit_id" ref="document.view_document_directory_form" />
<field name="type">form</field>
<field name="arch" type="xml">
- <page string="Dynamic context" position="after" version="7.0">
+ <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
<page string="WebDAV properties">
<label string="These properties will be added to WebDAV requests" colspan="4" />
@@ -97,7 +97,7 @@
</form>
</field>
</page>
- </page>
+ </xpath>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
