diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-06-12 14:37:49 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-06-12 14:37:49 +0200 |
| commit | a48014d67a5185c645ac876d365b4cb85cbb6b1f (patch) | |
| tree | df9a459c0f246f1b189bb338b1b3470d87ff3f02 /mediagoblin/celery_setup/from_celery.py | |
| parent | 44e2da2fe60a3b8765d0fef5a9ce0c3e5997dd01 (diff) | |
| parent | 68ffb13690fa0c364c514ce253364f928e50841c (diff) | |
| download | mediagoblin-a48014d67a5185c645ac876d365b4cb85cbb6b1f.tar.lz mediagoblin-a48014d67a5185c645ac876d365b4cb85cbb6b1f.tar.xz mediagoblin-a48014d67a5185c645ac876d365b4cb85cbb6b1f.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 0669e80c..5fa9ba76 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -23,7 +23,7 @@ from mediagoblin import storage from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.globals import setup_globals -from mediagoblin import globals as mgoblin_globals +from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery' @@ -76,6 +76,10 @@ def setup_self(setup_globals_func=setup_globals): queue_store = storage.storage_system_from_paste_config( mgoblin_section, 'queuestore') + workbench_manager = WorkbenchManager( + mgoblin_section.get( + 'workbench_path', DEFAULT_WORKBENCH_DIR)) + setup_globals_func( db_connection=connection, database=db, @@ -84,7 +88,8 @@ def setup_self(setup_globals_func=setup_globals): email_sender_address=mgoblin_section.get( 'email_sender_address', 'notice@mediagoblin.example.org'), - queue_store=queue_store) + queue_store=queue_store, + workbench_manager=workbench_manager) if os.environ['CELERY_CONFIG_MODULE'] == OUR_MODULENAME: |