[Zope-Checkins] CVS: Zope/lib/python/ZServer - __init__.py:1.31 utils.py:1.2

[Chris McDonough]

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

Modified Files:
	__init__.py utils.py 
Log Message:
Dont try to dwim CONNECTION_LIMIT, instead take it from Zope configuration.


=== Zope/lib/python/ZServer/__init__.py 1.30 => 1.31 ===
--- Zope/lib/python/ZServer/__init__.py:1.30	Sat Jul 19 16:17:01 2003
+++ Zope/lib/python/ZServer/__init__.py	Sat Jul 19 23:51:17 2003
@@ -13,6 +13,7 @@
 
 import sys
 import utils
+from App.config import getConfiguration
 
 #########################################################
 ### declarations used by external packages
@@ -24,7 +25,7 @@
 ZSERVER_VERSION='1.1'
 
 # the maximum number of incoming connections to ZServer
-CONNECTION_LIMIT=utils.getMaxSockets()
+CONNECTION_LIMIT=1000 # may be reset by max_listen_sockets handler in Zope
 
 # the Zope version string
 ZOPE_VERSION=utils.getZopeVersion()


=== Zope/lib/python/ZServer/utils.py 1.1 => 1.2 ===
--- Zope/lib/python/ZServer/utils.py:1.1	Sat Jul 19 16:17:01 2003
+++ Zope/lib/python/ZServer/utils.py	Sat Jul 19 23:51:17 2003
@@ -13,10 +13,6 @@
 
 """ A set of utility routines used by asyncore initialization """
 
-def getMaxSockets():
-    from medusa.test import max_sockets
-    return max_sockets.max_select_sockets()
-
 def getZopeVersion():
     import App.version_txt
     App.version_txt.version_txt()