[Zope-Checkins] CVS: Zope - z2.py:1.91
Guido van Rossum
guido@python.org
Fri, 17 Jan 2003 13:23:07 -0500
Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv30602
Modified Files:
z2.py
Log Message:
Use zdaemon.Daemon.run() now that zdaemon.__init__ no longer imports
run from Daemon.
=== Zope/z2.py 1.90 => 1.91 ===
--- Zope/z2.py:1.90 Sun Nov 24 00:25:57 2002
+++ Zope/z2.py Fri Jan 17 13:23:05 2003
@@ -517,7 +517,7 @@
if LOCALE_ID is not None:
set_locale(LOCALE_ID)
-import zdaemon
+import zdaemon.Daemon
# from this point forward we can use the zope logger
# importing ZDaemon before importing ZServer causes ZServer logging
# not to work.
@@ -550,7 +550,7 @@
# zdaemon.run creates a process which "manages" the actual Zope
# process (restarts it if it dies). The management process passes along
# signals that it receives to its child.
- zdaemon.run(sys.argv, os.path.join(CLIENT_HOME, PID_FILE))
+ zdaemon.Daemon.run(sys.argv, os.path.join(CLIENT_HOME, PID_FILE))
os.chdir(CLIENT_HOME)