[Zope-Checkins] CVS: Zope/lib/python/ZEO - mkzeoinst.py:1.18.8.1
runzeo.py:1.15.6.3 schema.xml:1.11.14.1
Fred Drake
cvs-admin at zope.org
Fri Oct 24 17:33:29 EDT 2003
Update of /cvs-repository/Zope/lib/python/ZEO
In directory cvs.zope.org:/tmp/cvs-serv22928/lib/python/ZEO
Modified Files:
Tag: Zope-2_7-branch
mkzeoinst.py runzeo.py schema.xml
Log Message:
Change the ZEO control process and configuration schema so that a single
configuration file can be used for both the runzeo and zeoctl scripts.
This makes it easier to keep all the configuration needed to support the
ZEO server process in a single file.
For more explanation of the changes, see
http://zope.org/Members/fdrake/WikiBlog/ZEOServerConfiguration
=== Zope/lib/python/ZEO/mkzeoinst.py 1.18 => 1.18.8.1 ===
--- Zope/lib/python/ZEO/mkzeoinst.py:1.18 Fri Apr 4 00:16:50 2003
+++ Zope/lib/python/ZEO/mkzeoinst.py Fri Oct 24 17:32:59 2003
@@ -20,11 +20,10 @@
options (all of which have default values), create the following:
<home>/etc/zeo.conf -- ZEO config file
-<home>/etc/zeoctl.conf -- zdctl+zdrun config file
<home>/var/ -- Directory for data files: Data.fs etc.
<home>/log/ -- Directory for log files: zeo.log and zeoctl.log
<home>/bin/runzeo -- the zeo server runner
-<home>/bin/zeoctl -- start/stop script (a shim for zdctl.py)
+<home>/bin/zeoctl -- start/stop script (a shim for zeoctl.py)
The script will not overwrite existing files; instead, it will issue a
warning if an existing file is found that differs from the file that
@@ -39,9 +38,10 @@
import stat
import getopt
-zeo_conf_template = """# ZEO configuration file
+zeo_conf_template = """\
+# ZEO configuration file
-%%define INSTANCE_HOME %(instance_home)s
+%%define INSTANCE %(instance_home)s
<zeo>
address %(port)d
@@ -52,52 +52,42 @@
</zeo>
<filestorage 1>
- path $INSTANCE_HOME/var/Data.fs
+ path $INSTANCE/var/Data.fs
</filestorage>
<eventlog>
level info
<logfile>
- path $INSTANCE_HOME/log/zeo.log
+ path $INSTANCE/log/zeo.log
</logfile>
</eventlog>
-"""
-
-runner_conf_template = """# %(package)sctl configuration file
-
-%%define INSTANCE_HOME %(instance_home)s
<runner>
- program $INSTANCE_HOME/bin/runzeo
- socket-name $INSTANCE_HOME/etc/%(package)s.zdsock
+ program $INSTANCE/bin/runzeo
+ socket-name $INSTANCE/etc/%(package)s.zdsock
daemon true
forever false
backoff-limit 10
exit-codes 0, 2
- directory $INSTANCE_HOME
+ directory $INSTANCE
default-to-interactive true
# user zope
python %(python)s
zdrun %(zope_home)s/zdaemon/zdrun.py
+
# This logfile should match the one in the %(package)s.conf file.
# It is used by zdctl's logtail command, zdrun/zdctl doesn't write it.
- logfile $INSTANCE_HOME/log/%(package)s.log
+ logfile $INSTANCE/log/%(package)s.log
</runner>
-
-<eventlog>
- level info
- <logfile>
- path $INSTANCE_HOME/log/%(package)sctl.log
- </logfile>
-</eventlog>
"""
-zdctl_template = """#!/bin/sh
-# %(PACKAGE)s instance start script
+zeoctl_template = """\
+#!/bin/sh
+# %(PACKAGE)s instance control script
# The following two lines are for chkconfig. On Red Hat Linux (and
# some other systems), you can copy or symlink this script into
-# /etc/rc.d/init.d/ and then run chkconfig(8), to automatically start
+# /etc/rc.d/init.d/ and then use chkconfig(8) to automatically start
# %(PACKAGE)s at boot time.
# chkconfig: 345 90 10
@@ -105,33 +95,32 @@
PYTHON="%(python)s"
ZOPE_HOME="%(zope_home)s"
-INSTANCE_HOME="%(instance_home)s"
-CONFIG_FILE="$INSTANCE_HOME/etc/%(package)sctl.conf"
+CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
PYTHONPATH="$ZOPE_HOME"
export PYTHONPATH
-ZDCTL="$ZOPE_HOME/zdaemon/zdctl.py"
+ZEOCTL="$ZOPE_HOME/ZEO/zeoctl.py"
-exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" ${1+"$@"}
+exec "$PYTHON" "$ZEOCTL" -C "$CONFIG_FILE" ${1+"$@"}
"""
-runzeo_template = """#!/bin/sh
+runzeo_template = """\
+#!/bin/sh
# %(PACKAGE)s instance start script
PYTHON="%(python)s"
ZOPE_HOME="%(zope_home)s"
-INSTANCE_HOME="%(instance_home)s"
-CONFIG_FILE="$INSTANCE_HOME/etc/%(package)s.conf"
+CONFIG_FILE="%(instance_home)s/etc/%(package)s.conf"
PYTHONPATH="$ZOPE_HOME"
export PYTHONPATH
-ZEO_RUN="$ZOPE_HOME/ZEO/runzeo.py"
+RUNZEO="$ZOPE_HOME/ZEO/runzeo.py"
-exec "$PYTHON" "$ZEO_RUN" -C "$CONFIG_FILE" ${1+"$@"}
+exec "$PYTHON" "$RUNZEO" -C "$CONFIG_FILE" ${1+"$@"}
"""
def main():
@@ -193,8 +182,7 @@
makedir(home, "log")
makedir(home, "bin")
makefile(zeo_conf_template, home, "etc", "zeo.conf", **params)
- makefile(runner_conf_template, home, "etc", "zeoctl.conf", **params)
- makexfile(zdctl_template, home, "bin", "zeoctl", **params)
+ makexfile(zeoctl_template, home, "bin", "zeoctl", **params)
makexfile(runzeo_template, home, "bin", "runzeo", **params)
=== Zope/lib/python/ZEO/runzeo.py 1.15.6.2 => 1.15.6.3 ===
--- Zope/lib/python/ZEO/runzeo.py:1.15.6.2 Mon Sep 15 14:02:59 2003
+++ Zope/lib/python/ZEO/runzeo.py Fri Oct 24 17:32:59 2003
@@ -99,9 +99,9 @@
class ZEOOptions(ZDOptions, ZEOOptionsMixin):
logsectionname = "eventlog"
+ schemadir = os.path.dirname(ZEO.__file__)
def __init__(self):
- self.schemadir = os.path.dirname(ZEO.__file__)
ZDOptions.__init__(self)
self.add_zeo_options()
self.add("storages", "storages",
=== Zope/lib/python/ZEO/schema.xml 1.11 => 1.11.14.1 ===
--- Zope/lib/python/ZEO/schema.xml:1.11 Wed Mar 26 14:40:15 2003
+++ Zope/lib/python/ZEO/schema.xml Fri Oct 24 17:32:59 2003
@@ -1,5 +1,8 @@
<schema>
+ <!-- note that zeoctl.xml is a closely related schema which should
+ match this schema, but should require the "runner" section -->
+
<description>
This schema describes the configuration of the ZEO storage server
process.
@@ -13,8 +16,13 @@
<import package="zLOG"/>
+ <!-- runner control -->
+ <import package="zdaemon"/>
+
<section type="zeo" name="*" required="yes" attribute="zeo" />
+
+ <section type="runner" name="*" required="no" attribute="runner" />
<multisection name="+" type="ZODB.storage"
attribute="storages"
More information about the Zope-Checkins
mailing list