# HG changeset patch # User Alexandre Fayolle # Date 1273150124 -7200 # Node ID d1b6db4d7b3fc30250b4933da4cb97ccf18fcc4f # Parent ce836b665a652a469c25c5c4cb596b19525e2dd4# Parent f3bb53f1737c5614251cc18b80531278ca560701 merge diff -r f3bb53f1737c -r d1b6db4d7b3f etwist/service.py --- a/etwist/service.py Thu May 06 14:26:47 2010 +0200 +++ b/etwist/service.py Thu May 06 14:48:44 2010 +0200 @@ -26,8 +26,7 @@ sys.exit(3) -from cubicweb.etwist.server import (CubicWebRootResource, reactor, server, - parsePOSTData, channel) +from cubicweb.etwist.server import (CubicWebRootResource, reactor, server) import logging from logging import getLogger, handlers @@ -39,7 +38,7 @@ for var in env_vars: if var not in env: raise Exception('The environment variables %s must be set.' % \ - ', '.join(env_vars)) + ', '.join(env_vars)) if not env.get('USERNAME'): env['USERNAME'] = 'cubicweb' @@ -53,7 +52,6 @@ cwcfg.load_cwctl_plugins() logger = getLogger('cubicweb') set_log_methods(CubicWebRootResource, logger) - server.parsePOSTData = parsePOSTData def SvcStop(self): self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) @@ -78,7 +76,7 @@ # serve it via standard HTTP on port set in the configuration port = config['port'] or 8080 logger.info('listening on port %s' % port) - reactor.listenTCP(port, channel.HTTPFactory(website)) + reactor.listenTCP(port, website) root_resource.init_publisher() root_resource.start_service() logger.info('instance started on %s', root_resource.base_url)