Log message for revision 30467: - Make it so webdav-source server is distinguishable from the default http server in the ZMI and event.log
Changed: U Zope/trunk/lib/python/ZServer/HTTPServer.py U Zope/trunk/lib/python/ZServer/datatypes.py -=- Modified: Zope/trunk/lib/python/ZServer/HTTPServer.py =================================================================== --- Zope/trunk/lib/python/ZServer/HTTPServer.py 2005-05-20 15:56:59 UTC (rev 30466) +++ Zope/trunk/lib/python/ZServer/HTTPServer.py 2005-05-20 17:23:05 UTC (rev 30467) @@ -380,8 +380,8 @@ class zhttp_server(http_server): "http server" - SERVER_IDENT='Zope/%s ZServer/%s' % (ZOPE_VERSION,ZSERVER_VERSION) - + SERVER_IDENT = 'Zope/%s ZServer/%s' % (ZOPE_VERSION, ZSERVER_VERSION) + server_protocol = 'HTTP' channel_class = zhttp_channel shutup=0 @@ -389,16 +389,17 @@ self.shutup=1 http_server.__init__(self, ip, port, resolver, logger_object) self.shutup=0 - self.log_info('HTTP server started at %s\n' + self.log_info('%s server started at %s\n' '\tHostname: %s\n\tPort: %d' % ( - time.ctime(time.time()), - self.server_name, - self.server_port - )) + self.server_protocol, + time.ctime(time.time()), + self.server_name, + self.server_port + )) def clean_shutdown_control(self,phase,time_in_this_phase): if phase==2: - self.log_info('closing HTTP to new connections') + self.log_info('closing %s to new connections' % self.server_protocol) self.close() def log_info(self, message, type='info'): @@ -418,3 +419,6 @@ # override asyncore limits for nt's listen queue size self.accepting = 1 return self.socket.listen (num) + +class zwebdav_server(zhttp_server): + server_protocol = 'WebDAV' Modified: Zope/trunk/lib/python/ZServer/datatypes.py =================================================================== --- Zope/trunk/lib/python/ZServer/datatypes.py 2005-05-20 15:56:59 UTC (rev 30466) +++ Zope/trunk/lib/python/ZServer/datatypes.py 2005-05-20 17:23:05 UTC (rev 30467) @@ -58,27 +58,29 @@ class HTTPServerFactory(ServerFactory): + def __init__(self, section): + from ZServer import HTTPServer if not section.address: raise ZConfig.ConfigurationError( "No 'address' settings found " "within the 'http-server' or 'webdav-source-server' section") ServerFactory.__init__(self, section.address) + self.server_class = HTTPServer.zhttp_server self.force_connection_close = section.force_connection_close # webdav-source-server sections won't have webdav_source_clients: webdav_clients = getattr(section, "webdav_source_clients", None) self.webdav_source_clients = webdav_clients 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.ip, port=self.port, - resolver=self.dnsresolver, - logger_object=access_logger) + server = self.server_class(ip=self.ip, port=self.port, + resolver=self.dnsresolver, + logger_object=access_logger) server.install_handler(handler) return server @@ -88,6 +90,12 @@ class WebDAVSourceServerFactory(HTTPServerFactory): + + def __init__(self, section): + from ZServer import HTTPServer + HTTPServerFactory.__init__(self, section) + self.server_class = HTTPServer.zwebdav_server + def createHandler(self): from ZServer.WebDAVSrcHandler import WebDAVSrcHandler return WebDAVSrcHandler(self.module, '', self.cgienv) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins