From 3611f431b93e4bed0bfb8d360dc19cb2aa52778b Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 14 Jun 2012 11:34:50 +0530 Subject: [IMP]document: remove warning bzr revid: kjo@tinyerp.com-20120614060450-w8771020su128gmg --- addons/document_ftp/ftpserver/__init__.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'addons/document_ftp/ftpserver/__init__.py') diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 2e09a938a05..c9f735cdd9e 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -23,7 +23,7 @@ import threading import ftpserver import authorizer import abstracted_fs -import netsvc +import logging from tools import config def start_server(): @@ -35,9 +35,6 @@ def start_server(): 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 @@ def start_server(): 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() -- cgit v1.2.3 From 0c374a66bc3de5cdf48eb66b2078c0946aa045db Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Fri, 22 Jun 2012 12:18:39 +0530 Subject: [IMP] Add logging at the top of python files bzr revid: fka@tinyerp.com-20120622064839-llitm8szgikxznwr --- addons/document_ftp/ftpserver/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/document_ftp/ftpserver/__init__.py') diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index c9f735cdd9e..582972b9c4d 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -25,7 +25,7 @@ import authorizer import abstracted_fs import logging from tools import config - +_logger = logging.getLogger(__name__) def start_server(): HOST = config.get('ftp_server_host', '127.0.0.1') PORT = int(config.get('ftp_server_port', '8021')) @@ -35,7 +35,7 @@ def start_server(): PASSIVE_PORTS = int(pps[0]), int(pps[1]) class ftp_server(threading.Thread): - + def run(self): autho = authorizer.authorizer() ftpserver.FTPHandler.authorizer = autho @@ -45,17 +45,17 @@ def start_server(): if PASSIVE_PORTS: ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS - ftpserver.log = lambda msg: logging.getLogger('document.ftp').info(msg) + ftpserver.log = lambda msg: _logger.info(msg) ftpserver.logline = lambda msg: None - ftpserver.logerror = lambda msg: logging.getLogger('document.ftp').error(msg) + ftpserver.logerror = lambda msg: self.logger.error(msg) ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler) ftpd.serve_forever() if HOST.lower() == 'none': - logging.getLogger('document.ftp').info("\n Server FTP Not Started\n") + _logger.info("\n Server FTP Not Started\n") else: - logging.getLogger('document.ftp').info("\n Serving FTP on %s:%s\n" % (HOST, PORT)) + _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT)) ds = ftp_server() ds.daemon = True ds.start() -- cgit v1.2.3 From c180a7f941b503b9a06a8dad8a6c117374775b25 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 26 Jun 2012 22:19:46 +0200 Subject: [FIX] revert ir_values on document bzr revid: al@openerp.com-20120626201946-44c5odspvbttqyv1 --- addons/document_ftp/ftpserver/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/document_ftp/ftpserver/__init__.py') diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 582972b9c4d..59aff85c633 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -47,7 +47,7 @@ def start_server(): ftpserver.log = lambda msg: _logger.info(msg) ftpserver.logline = lambda msg: None - ftpserver.logerror = lambda msg: self.logger.error(msg) + ftpserver.logerror = lambda msg: _logger.error(msg) ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler) ftpd.serve_forever() -- cgit v1.2.3