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

Actually call setup_celery_from_config when launching from paste.

Browse Source 
Also changed **kw to **app_config, which is more useful of a variable
name.
This commit is contained in:
Christopher Allan Webber 2011-04-24 20:57:38 -05:00
parent bb64a6073c
commit 5784c4e963
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mediagoblin/app.py
View File

@ -22,6 +22,7 @@ from webob import Request, exc
from mediagoblin import routing, util, models, storage, staticdirect from mediagoblin import routing, util, models, storage, staticdirect
from mediagoblin.globals import setup_globals from mediagoblin.globals import setup_globals
from mediagoblin.celery_setup import setup_celery_from_config
class Error(Exception): pass class Error(Exception): pass
@ -107,33 +108,37 @@ class MediaGoblinApp(object):
return controller(request)(environ, start_response) return controller(request)(environ, start_response)
def paste_app_factory(global_config, **kw): def paste_app_factory(global_config, **app_config):
# Get the database connection # Get the database connection
connection = mongokit.Connection( connection = mongokit.Connection(
kw.get('db_host'), kw.get('db_port')) app_config.get('db_host'), app_config.get('db_port'))
# Set up the storage systems. # Set up the storage systems.
public_store = storage.storage_system_from_paste_config( public_store = storage.storage_system_from_paste_config(
kw, 'publicstore') app_config, 'publicstore')
queue_store = storage.storage_system_from_paste_config( queue_store = storage.storage_system_from_paste_config(
kw, 'queuestore') app_config, 'queuestore')
# Set up the staticdirect system # Set up the staticdirect system
if kw.has_key('direct_remote_path'): if app_config.has_key('direct_remote_path'):
staticdirector = staticdirect.RemoteStaticDirect( staticdirector = staticdirect.RemoteStaticDirect(
kw['direct_remote_path'].strip()) app_config['direct_remote_path'].strip())
elif kw.has_key('direct_remote_paths'): elif app_config.has_key('direct_remote_paths'):
direct_remote_path_lines = app_config[
'direct_remote_paths'].strip().splitlines()
staticdirector = staticdirect.MultiRemoteStaticDirect( staticdirector = staticdirect.MultiRemoteStaticDirect(
dict([line.strip().split(' ', 1) dict([line.strip().split(' ', 1)
for line in kw['direct_remote_paths'].strip().splitlines()])) for line in direct_remote_path_lines]))
else: else:
raise ImproperlyConfigured( raise ImproperlyConfigured(
"One of direct_remote_path or direct_remote_paths must be provided") "One of direct_remote_path or direct_remote_paths must be provided")
setup_celery_from_config(app_config, global_config)
mgoblin_app = MediaGoblinApp( mgoblin_app = MediaGoblinApp(
connection, kw.get('db_name', 'mediagoblin'), connection, app_config.get('db_name', 'mediagoblin'),
public_store=public_store, queue_store=queue_store, public_store=public_store, queue_store=queue_store,
staticdirector=staticdirector, staticdirector=staticdirector,
user_template_path=kw.get('local_templates')) user_template_path=app_config.get('local_templates'))
return mgoblin_app return mgoblin_app