[MERGE] Forward port of 7.0 until rev. 8534.

bzr revid: vmt@openerp.com-20130104093953-p92uylaux9u24isn

1 files changed, 9 insertions, 2 deletions

diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index b5ada070c84..3749a02a387 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -20,13 +20,20 @@
 ##############################################################################
 
 import threading
-import ftpserver
+import logging
+
 import authorizer
 import abstracted_fs
-import logging
+import ftpserver
+
+import openerp
 from openerp.tools import config
 _logger = logging.getLogger(__name__)
+
 def start_server():
+    if openerp.multi_process:
+        _logger.info("FTP disabled in multiprocess mode")
+        return
     HOST = config.get('ftp_server_host', '127.0.0.1')
     PORT = int(config.get('ftp_server_port', '8021'))
     PASSIVE_PORTS = None