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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZEO-ZRPC-Dev
	ClientStorage.py 
Log Message:
A few small changes to track recent changes to zrpc2.

notifyDisconnected() is no longer called with an argument.

Don't make wait_for_server_on_startup the default.

Don't explicitly close the zrpc2 connection in close(); the manager
will take care of it.




=== StandaloneZODB/ZEO/ClientStorage.py 1.26.4.32 => 1.26.4.33 ===
                  name='', client='', debug=0, var=None,
                  min_disconnect_poll=5, max_disconnect_poll=300,
-                 wait_for_server_on_startup=1, read_only=0):
+                 wait_for_server_on_startup=0, read_only=0):
 
         self._server = disconnected_stub
         self._is_read_only = read_only
@@ -168,7 +168,7 @@
         self._basic_init(name or str(addr))
 
         # Decide whether to use non-temporary files
-        client = client or os.environ.get('ZEO_CLIENT','')
+        client = client or os.environ.get('ZEO_CLIENT', '')
         self._cache = ClientCache.ClientCache(storage, cache_size,
                                               client=client, var=var)
         self._cache.open() # XXX
@@ -252,7 +252,7 @@
     ### in the middle of notifyDisconnected, because *it's*
     ### responsible for starting the thread that makes the connection.
 
-    def notifyDisconnected(self, ignored):
+    def notifyDisconnected(self):
         log2(PROBLEM, "Disconnected from storage")
         self._server = disconnected_stub
         if self._transaction:
@@ -335,9 +335,9 @@
         # Close the manager first, so that it doesn't attempt to
         # re-open the connection. 
         self._rpc_mgr.close()
-        if self._server is not disconnected_stub:
-            # XXX why doesn't the manager close this for us?
-            self._server.rpc.close()
+##        if self._server is not disconnected_stub:
+##            # XXX why doesn't the manager close this for us?
+##            self._server.rpc.close()
         if self._cache is not None:
             self._cache.close()