[TYPO] replace tinyerp per openerp

[odoo/odoo.git] / addons / document_ftp / ftpserver / __init__.py

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
old mode 100755 (executable)
new mode 100644 (file)
index d110267..59aff85
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -23,44 +23,42 @@ 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'))
+    PASSIVE_PORTS = None
+    pps = config.get('ftp_server_passive_ports', '').split(':')
+    if len(pps) == 2:
+        PASSIVE_PORTS = int(pps[0]), int(pps[1])
 
-HOST = config.get('ftp_server_host', '127.0.0.1')
-PORT = int(config.get('ftp_server_port', '8021'))
-PASSIVE_PORTS = None
-pps = config.get('ftp_server_passive_ports', '').split(':')
-if len(pps) == 2:
-    PASSIVE_PORTS = int(pps[0]), int(pps[1])
+    class ftp_server(threading.Thread):
+        
+        def run(self):
+            autho = authorizer.authorizer()
+            ftpserver.FTPHandler.authorizer = autho
+            ftpserver.max_cons = 300
+            ftpserver.max_cons_per_ip = 50
+            ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
+            if PASSIVE_PORTS:
+                ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
 
-class ftp_server(threading.Thread):
-    def log(self, level, message):
-        logger = netsvc.Logger()
-        logger.notifyChannel('FTP', level, message)
+            ftpserver.log = lambda msg: _logger.info(msg)
+            ftpserver.logline = lambda msg: None
+            ftpserver.logerror = lambda msg: _logger.error(msg)
 
-    def run(self):
-        autho = authorizer.authorizer()
-        ftpserver.FTPHandler.authorizer = autho
-        ftpserver.max_cons = 300
-        ftpserver.max_cons_per_ip = 50
-        ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
-        if PASSIVE_PORTS:
-            ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
+            ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
+            ftpd.serve_forever()
 
-        ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg)
-        ftpserver.logline = lambda msg: None
-        ftpserver.logerror = lambda msg: self.log(netsvc.LOG_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")
-else:
-    netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT))
-    ds = ftp_server()
-    ds.daemon = True
-    ds.start()
+    if HOST.lower() == 'none':
+        _logger.info("\n Server FTP Not Started\n")
+    else:
+        _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
+        ds = ftp_server()
+        ds.daemon = True
+        ds.start()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: