[Zope-Checkins] CVS: Zope/inst - custom_zodb.py.in:1.1.2.3

Jens Vagelpohl jens@zope.com
Sat, 7 Sep 2002 13:11:17 -0400


Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv26934/inst

Modified Files:
      Tag: chrism-install-branch
	custom_zodb.py.in 
Log Message:
- more fixes to make zeo setups work correctly



=== Zope/inst/custom_zodb.py.in 1.1.2.2 => 1.1.2.3 ===
--- Zope/inst/custom_zodb.py.in:1.1.2.2	Sat Sep  7 09:59:12 2002
+++ Zope/inst/custom_zodb.py.in	Sat Sep  7 13:11:16 2002
@@ -48,17 +48,17 @@
         port = int(port_or_path)
         conn = (hostname, port)
     except:
-        conn = path
+        conn = port_or_path
     try:
         import ZServer
         import ZEO.ClientStorage
         # we left out "name" here but it's ok as it's just the
         # "pretty name" shown in the control panel
         Storage = ZEO.ClientStorage.ClientStorage(
-            connection=conn, storage=storage_name, cache_size=cache_size,
-            client=client_name, debug=debug, var=cache_dir,
+            addr=conn, storage=storage_name, cache_size=cache_size,
+            client=client_name, var=cache_dir,
             min_disconnect_poll=min_disconn, max_disconnect_poll=max_disconn,
-            wait_for_server_on_startup=wait)
+            wait=wait)
     except:
         zLOG.LOG('custom_zodb', 100, 'Could not use ZEO!', error=sys.exc_info())
         traceback.print_exc()