[Zope3-checkins] SVN: Zope3/trunk/ Added rudimentary ZEO support for the in-place instance. Instructions:

[Philipp von Weitershausen]

Log message for revision 29992:
  Added rudimentary ZEO support for the in-place instance. Instructions:
    * edit zeo.conf to configure the ZEO server
    * start the ZEO server with bin/runzeo or bin/zopectl
    * uncomment zeoclient storage in zope.conf (comment filestorage instead)
    * start the Zope server with z3.py
  
  Instances don't support this yet.
  

Changed:
  _U  Zope3/trunk/
  A   Zope3/trunk/bin/runzeo
  A   Zope3/trunk/bin/zeoctl
  A   Zope3/trunk/zeo.conf
  U   Zope3/trunk/zope.conf.in

-=-

Property changes on: Zope3/trunk
___________________________________________________________________
Name: svn:ignore
   - overrides_ftesting.zcml
products_ftesting.zcml
principals.zcml
products.zcml
overrides.zcml
zope.conf
Data.fs
Data.fs.*
build
dist
coverage
z3.log
access.log
test-db
zdsock
setup.bat
start.bat
test.bat

   + overrides_ftesting.zcml
products_ftesting.zcml
principals.zcml
products.zcml
overrides.zcml
zope.conf
Data.fs
Data.fs.*
build
dist
coverage
z3.log
access.log
zeo.log
test-db
zdsock
setup.bat
start.bat
test.bat


Copied: Zope3/trunk/bin/runzeo (from rev 29979, Zope3/trunk/bin/zopectl)
===================================================================
--- Zope3/trunk/bin/zopectl	2005-04-14 02:48:34 UTC (rev 29979)
+++ Zope3/trunk/bin/runzeo	2005-04-14 20:39:29 UTC (rev 29992)
@@ -0,0 +1,18 @@
+#!/usr/bin/env python2.3
+
+import os
+import sys
+
+SCRIPT_NAME = os.path.abspath(__file__)
+INSTANCE_HOME = os.path.dirname(os.path.dirname(SCRIPT_NAME))
+SOFTWARE_HOME = os.path.join(INSTANCE_HOME, "src")
+
+if SOFTWARE_HOME not in sys.path:
+    sys.path.insert(0, SOFTWARE_HOME)
+
+CONFIG_FILE = os.path.join(INSTANCE_HOME, "zeo.conf")
+
+sys.argv[1:1] = ["-C", CONFIG_FILE]
+
+from ZEO.runzeo import main
+main()

Copied: Zope3/trunk/bin/zeoctl (from rev 29979, Zope3/trunk/bin/zopectl)
===================================================================
--- Zope3/trunk/bin/zopectl	2005-04-14 02:48:34 UTC (rev 29979)
+++ Zope3/trunk/bin/zeoctl	2005-04-14 20:39:29 UTC (rev 29992)
@@ -0,0 +1,18 @@
+#!/usr/bin/env python2.3
+
+import os
+import sys
+
+SCRIPT_NAME = os.path.abspath(__file__)
+INSTANCE_HOME = os.path.dirname(os.path.dirname(SCRIPT_NAME))
+SOFTWARE_HOME = os.path.join(INSTANCE_HOME, "src")
+
+if SOFTWARE_HOME not in sys.path:
+    sys.path.insert(0, SOFTWARE_HOME)
+
+CONFIG_FILE = os.path.join(INSTANCE_HOME, "zeo.conf")
+
+sys.argv[1:1] = ["-C", CONFIG_FILE]
+
+from ZEO.zeoctl import main
+main()

Copied: Zope3/trunk/zeo.conf (from rev 29979, Zope3/trunk/zdaemon.conf)
===================================================================
--- Zope3/trunk/zdaemon.conf	2005-04-14 02:48:34 UTC (rev 29979)
+++ Zope3/trunk/zeo.conf	2005-04-14 20:39:29 UTC (rev 29992)
@@ -0,0 +1,29 @@
+<runner>
+  program bin/runzeo
+</runner>
+
+<eventlog>
+  # This sets up logging to both a file (z3.log) and to standard
+  # output (STDOUT).  The "path" setting can be a relative or absolute
+  # filesystem path or the tokens STDOUT or STDERR.
+
+  <logfile>
+    path zeo.log
+  </logfile>
+
+  <logfile>
+    path STDOUT
+  </logfile>
+</eventlog>
+
+<filestorage 1>
+  path Data.fs
+</filestorage>
+
+<zeo>
+  address 9999
+  read-only false
+  invalidation-queue-size 100
+  # monitor-address PORT
+  # transaction-timeout SECONDS
+</zeo>

Modified: Zope3/trunk/zope.conf.in
===================================================================
--- Zope3/trunk/zope.conf.in	2005-04-14 20:27:09 UTC (rev 29991)
+++ Zope3/trunk/zope.conf.in	2005-04-14 20:39:29 UTC (rev 29992)
@@ -28,6 +28,17 @@
   <filestorage>
     path Data.fs
   </filestorage>
+
+# uncomment this if you want to connect to a local ZEO server
+# instead:
+#  <zeoclient>
+#    server localhost:9999
+#   storage 1
+#    # ZEO client cache, in bytes
+#    cache-size 20MB
+#    # Uncomment to have a persistent disk cache
+#    #client zeo1
+#  </zeoclient>
 </zodb>
 
 <accesslog>