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

Have the application set up instances of the WorkbenchManager.

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-06-11 19:47:02 -05:00
parent f43ecb0fc4
commit 7ecc58cc5c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mediagoblin/app.py
View File

@ -25,6 +25,8 @@ from mediagoblin import routing, util, storage, staticdirect
from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.db.open import setup_connection_and_db_from_config
from mediagoblin.globals import setup_globals from mediagoblin.globals import setup_globals
from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.celery_setup import setup_celery_from_config
from mediagoblin.process_media.workbench import (
WorkbenchManager, DEFAULT_WORKBENCH_DIR)
class Error(Exception): pass class Error(Exception): pass
@ -39,7 +41,8 @@ class MediaGoblinApp(object):
public_store, queue_store, public_store, queue_store,
staticdirector, staticdirector,
email_sender_address, email_debug_mode, email_sender_address, email_debug_mode,
user_template_path=None): user_template_path=None,
workbench_path=DEFAULT_WORKBENCH_DIR):
# Get the template environment # Get the template environment
self.template_loader = util.get_jinja_loader(user_template_path) self.template_loader = util.get_jinja_loader(user_template_path)
@ -66,7 +69,8 @@ class MediaGoblinApp(object):
db_connection=connection, db_connection=connection,
database=self.db, database=self.db,
public_store=self.public_store, public_store=self.public_store,
queue_store=self.queue_store) queue_store=self.queue_store,
workbench_manager=WorkbenchManager(workbench_path))
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
request = Request(environ) request = Request(environ)
@ -154,6 +158,7 @@ def paste_app_factory(global_config, **app_config):
email_sender_address=app_config.get( email_sender_address=app_config.get(
'email_sender_address', 'notice@mediagoblin.example.org'), 'email_sender_address', 'notice@mediagoblin.example.org'),
email_debug_mode=asbool(app_config.get('email_debug_mode')), email_debug_mode=asbool(app_config.get('email_debug_mode')),
user_template_path=app_config.get('local_templates')) user_template_path=app_config.get('local_templates'),
workbench_path=app_config.get('workbench_path', DEFAULT_WORKBENCH_DIR))
return mgoblin_app return mgoblin_app

10
mediagoblin/celery_setup/from_celery.py
View File

@ -23,7 +23,8 @@ from mediagoblin import storage
from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.db.open import setup_connection_and_db_from_config
from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.celery_setup import setup_celery_from_config
from mediagoblin.globals import setup_globals from mediagoblin.globals import setup_globals
from mediagoblin import globals as mgoblin_globals from mediagoblin.process_media.workbench import (
WorkbenchManager, DEFAULT_WORKBENCH_DIR)
OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery' OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery'
@ -76,6 +77,10 @@ def setup_self(setup_globals_func=setup_globals):
queue_store = storage.storage_system_from_paste_config( queue_store = storage.storage_system_from_paste_config(
mgoblin_section, 'queuestore') mgoblin_section, 'queuestore')
workbench_manager = WorkbenchManager(
mgoblin_section.get(
'workbench_path', DEFAULT_WORKBENCH_DIR))
setup_globals_func( setup_globals_func(
db_connection=connection, db_connection=connection,
database=db, database=db,
@ -84,7 +89,8 @@ def setup_self(setup_globals_func=setup_globals):
email_sender_address=mgoblin_section.get( email_sender_address=mgoblin_section.get(
'email_sender_address', 'email_sender_address',
'notice@mediagoblin.example.org'), 'notice@mediagoblin.example.org'),
queue_store=queue_store) queue_store=queue_store,
workbench_manager=workbench_manager)
if os.environ['CELERY_CONFIG_MODULE'] == OUR_MODULENAME: if os.environ['CELERY_CONFIG_MODULE'] == OUR_MODULENAME: