Merge remote-tracking branch 'gitorious/master'

1 files changed, 11 insertions, 6 deletions

diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py
index 0669e80c..c8ccebc8 100644
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/celery_setup/from_celery.py
@@ -22,14 +22,14 @@ from paste.deploy.converters import asbool
 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.mg_globals import setup_globals
+from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
 
 
-OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery'
+OUR_MODULENAME = __name__
 
 
-def setup_self(setup_globals_func=setup_globals):
+def setup_self():
     """
     Transform this module into a celery config module by reading the
     mediagoblin config file.  Set the environment variable
@@ -76,7 +76,11 @@ def setup_self(setup_globals_func=setup_globals):
     queue_store = storage.storage_system_from_paste_config(
         mgoblin_section, 'queuestore')
 
-    setup_globals_func(
+    workbench_manager = WorkbenchManager(
+        mgoblin_section.get(
+            'workbench_path', DEFAULT_WORKBENCH_DIR))
+
+    setup_globals(
         db_connection=connection,
         database=db,
         public_store=public_store,
@@ -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: