Changeset 9876

Timestamp:

13 Jan 2013, 02:15:28 (12 years ago)

Author:

uli

Message:

Respect async ZODB when setting up a new instance. Basic stress tests
now work again.

File:

• main/waeup.stress/trunk/src/waeup/stress/scripts.py (modified) (2 diffs)

main/waeup.stress/trunk/src/waeup/stress/scripts.py

@@ -6 +6 @@
 from zope.app.appsetup import database, config
 from zope.app.publication.zopepublication import ZopePublication
+from zope.app.wsgi import config as wsgi_config
 from waeup.kofa.app import University
 
@@ -43 +44 @@
     to this DB and the root folder.
     """
+    zope_conf = os.path.join(
+        instance_path, 'parts', 'etc', 'zope.conf')
+    config_file = os.path.join(
+        instance_path, 'parts', 'etc', 'site.zcml')
     print "WAEUP.STRESS: opening ZODB"
     zodb_file = os.path.join(
         instance_path, 'var', 'filestorage', 'Data.fs')
-    db = database(zodb_file)
+
+    print "WAEUP.STRESS: configuring ZODB from %s" % (
+        zope_conf)
+
+    db = wsgi_config(zope_conf)
+
+    # The way to configure a ZODB if only a single ZODB has to be set up.
+    #context = config(config_file)
+    #db = database(zodb_file)
+
     conn = db.open()
     root = conn.root()