[Zope-Checkins] CVS: Zope/lib/python/ZServer - datatypes.py:1.1.2.6

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/ZServer
In directory cvs.zope.org:/tmp/cvs-serv10433/lib/python/ZServer

Modified Files:
      Tag: new-install-branch
	datatypes.py 
Log Message:
Change how things get passed around.  Avoids some special cases.

=== Zope/lib/python/ZServer/datatypes.py 1.1.2.5 => 1.1.2.6 ===
--- Zope/lib/python/ZServer/datatypes.py:1.1.2.5	Mon Feb 24 14:36:16 2003
+++ Zope/lib/python/ZServer/datatypes.py	Mon Feb 24 16:56:29 2003
@@ -24,12 +24,11 @@
         else:
             self.host, self.port = address
 
-    def prepare(self, defaulthost=None, dnsresolver=None, logger=None,
+    def prepare(self, defaulthost=None, dnsresolver=None,
                 module=None, env=None, portbase=None):
         if defaulthost is not None:
             self._set_default_host(defaulthost)
         self.dnsresolver = dnsresolver
-        self.logger = logger
         self.module = module
         self.cgienv = env
         if portbase and self.port is not None:
@@ -60,13 +59,14 @@
 
     def create(self):
         from ZServer import HTTPServer
+        from ZServer.AccessLogger import access_logger
         handler = self.createHandler()
         handler._force_connection_close = self.force_connection_close
         if self.webdav_source_clients:
             handler.set_webdav_source_clients(self.webdav_source_clients)
         server = HTTPServer.zhttp_server(ip=self.host, port=self.port,
                                          resolver=self.dnsresolver,
-                                         logger_object=self.logger)
+                                         logger_object=access_logger)
         server.install_handler(handler)
         return server
 
@@ -86,10 +86,11 @@
         ServerFactory.__init__(self, section.address)
 
     def create(self):
+        from ZServer.AccessLogger import access_logger
         from ZServer.FTPServer import FTPServer
         return FTPServer(ip=self.host, port=self.port,
                          module=self.module, resolver=self.dnsresolver,
-                         logger_object=self.logger)
+                         logger_object=access_logger)
 
 
 class PCGIServerFactory(ServerFactory):
@@ -98,11 +99,12 @@
         self.path = section.path
 
     def create(self):
+        from ZServer.AccessLogger import access_logger
         from ZServer.PCGIServer import PCGIServer
         return PCGIServer(ip=self.host, port=self.port,
                           module=self.module, resolver=self.dnsresolver,
                           pcgi_file=self.path,
-                          logger_object=self.logger)
+                          logger_object=access_logger)
 
 
 class FCGIServerFactory(ServerFactory):
@@ -121,12 +123,13 @@
         if self.path is None:
             ServerFactory._set_default_host(self, host)
 
-    def create(self, resolver, logger, module, env=None):
+    def create(self):
+        from ZServer.AccessLogger import access_logger
         from ZServer.FCGIServer import FCGIServer
         return FCGIServer(ip=self.host, port=self.port,
                           socket_file=self.path,
                           module=self.module, resolver=self.dnsresolver,
-                          logger_object=self.logger)
+                          logger_object=access_logger)
 
 
 class MonitorServerFactory(ServerFactory):