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

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	custom_zodb.py.in 
Log Message:
Fix ZEO startup.


=== Zope/inst/custom_zodb.py.in 1.1.2.4 => 1.1.2.5 ===
--- Zope/inst/custom_zodb.py.in:1.1.2.4	Tue Sep 10 00:15:59 2002
+++ Zope/inst/custom_zodb.py.in	Tue Sep 10 17:55:00 2002
@@ -30,7 +30,7 @@
     port         = None
     path         = None
     hostname     = reg['zeo_storage_server_name']
-    port_or_path = reg['Directives.zeo_storage_server_port']
+    port_or_path = reg['zeo_storage_server_port']
     storage_name = reg['zeo_storage_server_storagename'] or '1'
     cache_size   = reg['zeo_client_cache_size'] or 200000000
     debug        = reg['zeo_client_debug'] or 0
@@ -43,22 +43,21 @@
         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
+	name = "%s, %s, %s" % (hostname, port_or_path, storage_name)
         Storage = ZEO.ClientStorage.ClientStorage(
-            connection=conn, storage=storage_name, cache_size=cache_size,
-            client=client_name, debug=debug, var=cache_dir,
+            conn, storage=storage_name, cache_size=cache_size,
+            name=name, client=client_name, debug=debug, var=cache_dir,
             min_disconnect_poll=min_disconn, max_disconnect_poll=max_disconn,
             wait_for_server_on_startup=wait)
     except:
-        zLOG.LOG('custom_zodb', 100, 'Could not use ZEO!', err=sys.exc_info())
+        zLOG.LOG('custom_zodb', 100, 'Could not use ZEO!',error=sys.exc_info())
         traceback.print_exc()
         err = ('Could not successfully start Zope due to ZEO configuration '
-               'error!  Clues exist in the traceback printed above.  Check '
+               'error.  Clues exist in the traceback printed above.  Check '
                'your zope.conf file for a misconfiguration.')
         warnings.warn(err)
         # exit the process instead of silently using a FileStorage