[Zodb-checkins] CVS: Zope/lib/python/ZEO - zeoctl.py:1.1.2.1 zeoctl.xml:1.1.2.1

[Fred Drake]

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

Added Files:
      Tag: Zope-2_7-branch
	zeoctl.py zeoctl.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


=== Added File Zope/lib/python/ZEO/zeoctl.py ===
"""Wrapper script for zdctl.py that causes it to use the ZEO schema."""

import os

import ZEO
import zLOG
import zdaemon.zdctl


# Main program
def main(args=None):
    options = zdaemon.zdctl.ZDCtlOptions()
    options.schemadir = os.path.dirname(ZEO.__file__)
    options.schemafile = "zeoctl.xml"
    zdaemon.zdctl.main(args, options)


if __name__ == "__main__":
    main()


=== Added File Zope/lib/python/ZEO/zeoctl.xml ===
<schema>

  <description>
    This schema describes the configuration of the ZEO storage server
    controller.  It differs from the schema for the storage server
    only in that the "runner" section is required.
  </description>

  <!-- Use the storage types defined by ZODB. -->
  <import package="ZODB"/>

  <!-- Use the ZEO server information structure. -->
  <import package="ZEO"/>

  <import package="zLOG"/>

  <!-- runner control -->
  <import package="zdaemon"/>


  <section type="zeo" name="*" required="yes" attribute="zeo" />

  <section type="runner" name="*" required="yes" attribute="runner" />

  <multisection name="+" type="ZODB.storage"
                attribute="storages"
                required="yes" />

  <section name="*" type="eventlog" attribute="eventlog" required="no" />

</schema>