diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/document_ftp/ftpserver | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/document_ftp/ftpserver')
| -rw-r--r-- | addons/document_ftp/ftpserver/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 3749a02a387..6474def3e99 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -34,6 +34,9 @@ def start_server(): if openerp.multi_process: _logger.info("FTP disabled in multiprocess mode") return + if openerp.evented: + _logger.info("FTP disabled in evented mode") + return HOST = config.get('ftp_server_host', '127.0.0.1') PORT = int(config.get('ftp_server_port', '8021')) PASSIVE_PORTS = None |