heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly load in the database and register the connection with the models

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-03-26 13:03:32 -05:00
parent 4329be147b
commit 2b4e236ac3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mediagoblin/app.py
View File

@ -3,10 +3,10 @@ import urllib
from beaker.middleware import SessionMiddleware from beaker.middleware import SessionMiddleware
import routes import routes
import pymongo import mongokit
from webob import Request, exc from webob import Request, exc
from mediagoblin import routing, util from mediagoblin import routing, util, models
class Error(Exception): pass class Error(Exception): pass
@ -25,11 +25,14 @@ class MediagoblinApp(object):
""" """
Really basic wsgi app using routes and WebOb. Really basic wsgi app using routes and WebOb.
""" """
def __init__(self, database, user_template_path=None): def __init__(self, connection, database_path, user_template_path=None):
self.template_env = util.get_jinja_env(user_template_path) self.template_env = util.get_jinja_env(user_template_path)
self.db = database self.connection = connection
self.db = connection['database_path']
self.routing = routing.get_mapper() self.routing = routing.get_mapper()
models.register_models(connection)
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
request = Request(environ) request = Request(environ)
path_info = request.path_info path_info = request.path_info
@ -59,6 +62,7 @@ class MediagoblinApp(object):
request.app = self request.app = self
request.template_env = self.template_env request.template_env = self.template_env
request.urlgen = routes.URLGenerator(self.routing, environ) request.urlgen = routes.URLGenerator(self.routing, environ)
request.db = self.db
# Do we really want to load this via middleware? Maybe? # Do we really want to load this via middleware? Maybe?
# let's comment it out till we start using it :) # let's comment it out till we start using it :)
@ -68,10 +72,11 @@ class MediagoblinApp(object):
def paste_app_factory(global_config, **kw): def paste_app_factory(global_config, **kw):
connection = pymongo.Connection() connection = mongokit.Connection(
db = connection[kw.get('db_name', 'mediagoblin')] kw.get('db_host'), kw.get('db_port'))
mgoblin_app = MediagoblinApp( mgoblin_app = MediagoblinApp(
db, user_template_path=kw.get('local_templates')) connection, kw.get('db_name', 'mediagoblin'),
user_template_path=kw.get('local_templates'))
return mgoblin_app return mgoblin_app