diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-06-27 13:25:08 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-06-27 13:25:08 +0530 |
| commit | 18dd2dfcab7ee866f5e344ea5c26d4e78faba2f2 (patch) | |
| tree | 068dcc026be4048b1bf56df1c6a61a28dcf34b0c /addons/document_ftp | |
| parent | ea46eb264517fac17720f3a9a524c766e891ac1d (diff) | |
| parent | 6c0bdc167b1c6a5b2cbb36a045bfd1abc1cd121a (diff) | |
[MERGE] Merged from openobject-addons.
bzr revid: jra@tinyerp.com-20120627075508-kko9c9dr67695hzw
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/ftpserver/__init__.py | 17 | ||||
| -rw-r--r-- | addons/document_ftp/ftpserver/abstracted_fs.py | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 2e09a938a05..59aff85c633 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -23,9 +23,9 @@ import threading import ftpserver import authorizer import abstracted_fs -import netsvc +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,10 +35,7 @@ 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() ftpserver.FTPHandler.authorizer = autho @@ -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: _logger.info(msg) ftpserver.logline = lambda msg: None - ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg) + ftpserver.logerror = lambda msg: _logger.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") + _logger.info("\n Server FTP Not Started\n") else: - netsvc.Logger().notifyChannel("FTP", netsvc.LOG_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() diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 83cd1cde725..429016a2376 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -56,7 +56,7 @@ class abstracted_fs(object): self.cwd = '/' self.cwd_node = None self.rnfr = None - self._log = logging.getLogger('FTP.fs') + self._log = logging.getLogger(__name__) # Ok def db_list(self): |