[Zodb-checkins] CVS: StandaloneZODB/ZEO - ClientStorage.py:1.35.6.4.2.2

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO
In directory cvs.zope.org:/tmp/cvs-serv11377

Modified Files:
      Tag: ZEO2-branch
	ClientStorage.py 
Log Message:
First step words protocol negotiation.

New client sends a 4-byte protocol id to the server.   XXX Is this
sufficient for now?

Also, rename "wait_for_server_on_startup" to "wait".  This change
affects a ctor calls in a bunch of files.


=== StandaloneZODB/ZEO/ClientStorage.py 1.35.6.4.2.1 => 1.35.6.4.2.2 ===
                  name='', client='', debug=0, var=None,
                  min_disconnect_poll=5, max_disconnect_poll=300,
-                 wait_for_server_on_startup=0, read_only=0):
+                 wait=0, read_only=0):
 
         self._server = disconnected_stub
         self._is_read_only = read_only
@@ -100,7 +100,7 @@
         # XXX What if we can only get a read-only connection and we
         # want a read-write connection?  Looks like the current code
         # will block forever.  (Future feature)
-        if wait_for_server_on_startup:
+        if wait:
             self._rpc_mgr.connect(sync=1)
         else:
             if not self._rpc_mgr.attempt_connect():
@@ -152,6 +152,9 @@
 
     def notifyConnected(self, c):
         log2(INFO, "Connected to storage via %s" % repr(c))
+
+        # check the protocol version here?
+
         stub = ServerStub.StorageServer(c)
 
         self._oids = []