Add engine setup and database structure creation function.

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 9b80fe001308f2d9d3cc50d1d43b341d0572caba..296c0e4effec4a0eaff5969e2fe8159b8a87c9c5 100644 (file)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -1,13 +1,21 @@
+import sqlahelper
 from pyramid.config import Configurator
 from sqlalchemy import engine_from_config
 
-from xonstat.models import initialize_sql
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
+    # setup the database engine
     engine = engine_from_config(settings, 'sqlalchemy.')
+    sqlahelper.add_engine(engine)
+
+    # create the database structures
+    # note: have to import here else we'll get` 
+    # "no engine 'default' was configured
+    from xonstat.models import initialize_sql
     initialize_sql(engine)
+
     config = Configurator(settings=settings)
     config.add_static_view('static', 'xonstat:static')
     return config.make_wsgi_app()

diff --git a/xonstat/models.py b/xonstat/models.py
index 57f32023e1a79f113a7b28174929c85124f3d627..ec3d89632bda5ca8f188f59d8f1d08cb852dfbe0 100644 (file)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -1,3 +1,4 @@
+import sqlahelper
 import transaction
 
 from sqlalchemy import Column
@@ -10,7 +11,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
 
-
+Engine=sqlahelper.get_engine()
 DBSession = scoped_session(sessionmaker())
 Base = declarative_base()