Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-ftp-post-load-vmt into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ftp-post-load-vmt/+merge/76973
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ftp-post-load-vmt/+merge/76973
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-ftp-post-load-vmt.
=== modified file 'document_ftp/__init__.py'
--- document_ftp/__init__.py 2011-01-14 00:11:01 +0000
+++ document_ftp/__init__.py 2011-09-26 12:30:39 +0000
@@ -21,4 +21,6 @@
import ftpserver
import wizard
+post_load = ftpserver.start_server
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'document_ftp/__openerp__.py'
--- document_ftp/__openerp__.py 2011-07-06 12:29:28 +0000
+++ document_ftp/__openerp__.py 2011-09-26 12:30:39 +0000
@@ -51,6 +51,7 @@
'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:
=== modified file 'document_ftp/ftpserver/__init__.py'
--- document_ftp/ftpserver/__init__.py 2011-01-14 00:11:01 +0000
+++ document_ftp/ftpserver/__init__.py 2011-09-26 12:30:39 +0000
@@ -26,41 +26,42 @@
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])
-
-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
-
- 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()
+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)
+
+ 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)
+
+ 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()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
