Major reorganization of how models are initialized and used. Saves lots of lines...

[xonotic/xonstat.git] / xonstat / __init__.py

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 5e0995f094eb2d1e26a159d6c7a46a2130bea174..3cf3f3e97e28a0715431f241071346171ac1de8f 100644 (file)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -2,6 +2,8 @@ import pyramid_jinja2
 import sqlahelper
 from pyramid.config import Configurator
 from sqlalchemy import engine_from_config
+from xonstat.models import initialize_db
+from xonstat.views import * 
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
@@ -10,16 +12,8 @@ def main(global_config, **settings):
     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)
-
-    # import the views
-    # note: have to import here else we'll get` 
-    # "no engine 'default' was configured
-    from xonstat.views import * 
+    # initialize database structures
+    initialize_db(engine)
 
     config = Configurator(settings=settings)
 
@@ -29,8 +23,7 @@ def main(global_config, **settings):
 
     config.add_route(name="main_index", pattern="/", view=main_index, 
             renderer='index.jinja2') 
-    config.add_route(name="stats_submit", pattern="stats/submit", view=stats_submit, 
-            renderer='index.jinja2') 
-    return config.make_wsgi_app()
-
+    config.add_route(name="stats_submit", pattern="stats/submit", 
+            view=stats_submit, renderer='index.jinja2') 
 
+    return config.make_wsgi_app()