[Zodb-checkins] CVS: ZODB3/ZODB - config.xml:1.1.4.3 config.py:1.1.4.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv4570/ZODB

Modified Files:
      Tag: zconfig-schema-devel-branch
	config.xml config.py 
Log Message:
Add simply config for ZEO


=== ZODB3/ZODB/config.xml 1.1.4.2 => 1.1.4.3 ===
--- ZODB3/ZODB/config.xml:1.1.4.2	Thu Jan  2 18:13:36 2003
+++ ZODB3/ZODB/config.xml	Thu Jan  2 18:30:40 2003
@@ -15,7 +15,7 @@
     </sectiontype>
 
     <sectiontype type="zeoclient">
-      <key name="addr" datatype="str" required="yes"/>
+      <multikey name="server" datatype="socket-address" required="yes"/>
       <key name="storage" datatype="str" default="1"/>
       <key name="cache_size" datatype="integer" default="20000000"/>
       <key name="name" datatype="str" default=""/>
@@ -30,6 +30,7 @@
 
   </sectiongroup>
 
+  <!-- the rest is the actual configuration for the database -->
   <section type="storage" name="*" attribute="storage"/>
   <key name="cache_size" datatype="integer" default="5000"/>
   <key name="pool_size" datatype="integer" default="7"/>


=== ZODB3/ZODB/config.py 1.1.4.1 => 1.1.4.2 ===
--- ZODB3/ZODB/config.py:1.1.4.1	Thu Jan  2 17:40:10 2003
+++ ZODB3/ZODB/config.py	Thu Jan  2 18:30:40 2003
@@ -67,4 +67,10 @@
                            stop=config.stop,
                            quota=config.quota)
 
+    def zeoclient(self, config):
+        from ZEO.ClientStorage import ClientStorage
+        L = [addr for family, addr in config.server]
+        return ClientStorage(L,
+                             wait=config.wait)
+
 storageFromConfig = StorageOpener().fromConfig