diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 19:47:02 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-11 19:47:02 -0500 |
commit | 7ecc58cc5cf49c87001c38ba5d0607644ca195d4 (patch) | |
tree | 5a60b13652f420524e9f5df17cd3f0b41d72ef61 /mediagoblin/app.py | |
parent | f43ecb0fc459c0ee64f3a40b98ed6bbf8564c107 (diff) | |
download | mediagoblin-7ecc58cc5cf49c87001c38ba5d0607644ca195d4.tar.lz mediagoblin-7ecc58cc5cf49c87001c38ba5d0607644ca195d4.tar.xz mediagoblin-7ecc58cc5cf49c87001c38ba5d0607644ca195d4.zip |
Have the application set up instances of the WorkbenchManager.
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r-- | mediagoblin/app.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index e5949531..da2b7d35 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -25,6 +25,8 @@ from mediagoblin import routing, util, storage, staticdirect from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.globals import setup_globals from mediagoblin.celery_setup import setup_celery_from_config +from mediagoblin.process_media.workbench import ( + WorkbenchManager, DEFAULT_WORKBENCH_DIR) class Error(Exception): pass @@ -39,7 +41,8 @@ class MediaGoblinApp(object): public_store, queue_store, staticdirector, email_sender_address, email_debug_mode, - user_template_path=None): + user_template_path=None, + workbench_path=DEFAULT_WORKBENCH_DIR): # Get the template environment self.template_loader = util.get_jinja_loader(user_template_path) @@ -66,7 +69,8 @@ class MediaGoblinApp(object): db_connection=connection, database=self.db, 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): request = Request(environ) @@ -154,6 +158,7 @@ def paste_app_factory(global_config, **app_config): email_sender_address=app_config.get( 'email_sender_address', 'notice@mediagoblin.example.org'), 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 |