merged with trunk

[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 100644 (file)
new mode 100755 (executable)
index 056782e..d110267
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -24,11 +24,10 @@ import ftpserver
 import authorizer
 import abstracted_fs
 import netsvc
-
 from tools import config
-from tools.misc import detect_ip_addr
-HOST = ''
-PORT = 8021
+
+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:
@@ -52,14 +51,16 @@ class ftp_server(threading.Thread):
         ftpserver.logline = lambda msg: None
         ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg)
 
-        HOST = config.get('ftp_server_address', detect_ip_addr())
-        PORT = int(config.get('ftp_server_port', '8021'))        
-        address = (HOST, PORT)
-        ftpd = ftpserver.FTPServer(address, ftpserver.FTPHandler)
+        ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
         ftpd.serve_forever()
 
-ds = ftp_server()
-ds.start()
+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()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: