[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - __init__.py:1.2.2.4

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: new-install-branch
	__init__.py 
Log Message:
Remove more of the daemonizing code that's no longer needed.


=== Zope/lib/python/Zope/Startup/__init__.py 1.2.2.3 => 1.2.2.4 ===
--- Zope/lib/python/Zope/Startup/__init__.py:1.2.2.3	Tue Feb 11 15:14:12 2003
+++ Zope/lib/python/Zope/Startup/__init__.py	Tue Feb 11 15:16:23 2003
@@ -98,25 +98,22 @@
 
     # if we're not using ZDaemon or if we're the child of a Zdaemon process,
     # start ZServer servers before we setuid so we can bind to low ports
-    if not cfg.use_daemon_process or (
-        cfg.use_daemon_process and os.environ.get('ZDAEMON_MANAGED')
-        ):
-        socket_err = (
-            'There was a problem starting a server of type "%s". '
-            'This may mean that your user does not have permission to '
-            'bind to the port which the server is trying to use or the '
-            'port may already be in use by another application.'
-            )
-        servers = []
-        for server in cfg.servers:
-            # create the server from the server factory
-            # set up in the config
-            try:
-                servers.append(server.create())
-            except socket.error:
-                raise ZConfig.ConfigurationError(socket_err
-                                                 % server.servertype())
-        cfg.servers = servers
+    socket_err = (
+        'There was a problem starting a server of type "%s". '
+        'This may mean that your user does not have permission to '
+        'bind to the port which the server is trying to use or the '
+        'port may already be in use by another application.'
+        )
+    servers = []
+    for server in cfg.servers:
+        # create the server from the server factory
+        # set up in the config
+        try:
+            servers.append(server.create())
+        except socket.error:
+            raise ZConfig.ConfigurationError(socket_err
+                                             % server.servertype())
+    cfg.servers = servers
 
     # do stuff that only applies to posix platforms (setuid, daemonizing)
     if os.name == 'posix':