From b1adb56fe06406fe1131d15136d4bc6cacc32a70 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 26 Sep 2011 14:28:14 +0200 Subject: [PATCH] [IMP] document_ftp: use the new post_load hook. bzr revid: vmt@openerp.com-20110926122814-avszd62679hb6u6i --- addons/document_ftp/__init__.py | 2 + addons/document_ftp/__openerp__.py | 1 + addons/document_ftp/ftpserver/__init__.py | 61 ++++++++++++----------- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/addons/document_ftp/__init__.py b/addons/document_ftp/__init__.py index af514df8985..b86320f9909 100644 --- a/addons/document_ftp/__init__.py +++ b/addons/document_ftp/__init__.py @@ -21,4 +21,6 @@ import ftpserver import wizard +post_load = ftpserver.start_server + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py index 2683ba5ef0a..f8f933c5e2b 100644 --- a/addons/document_ftp/__openerp__.py +++ b/addons/document_ftp/__openerp__.py @@ -51,6 +51,7 @@ FTP client. 'active': False, 'certificate': '00934787762705016005', 'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'], + 'post_load': 'post_load', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index d110267f175..2e09a938a05 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -26,41 +26,42 @@ import abstracted_fs import netsvc from tools import config -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]) +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]) -class ftp_server(threading.Thread): - def log(self, level, message): - logger = netsvc.Logger() - logger.notifyChannel('FTP', level, message) + 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 - 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 + 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 - 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) + 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() + 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': + 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: