From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 12 Jun 2011 14:16:12 +0000 (-0500)
Subject: Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=da579dec005834f92fb7d968e14610be9936d9a5;p=mediagoblin.git

Merge remote branch 'remotes/elrond/idea/clean_celery_setup'

Conflicts:
	mediagoblin/celery_setup/from_celery.py
---

da579dec005834f92fb7d968e14610be9936d9a5
diff --cc mediagoblin/celery_setup/from_celery.py
index 5fa9ba76,6fab59ca..71f93d76
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/celery_setup/from_celery.py
@@@ -23,13 -23,12 +23,13 @@@ from mediagoblin import storag
  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.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,11 -75,7 +76,11 @@@
      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(
+     setup_globals(
          db_connection=connection,
          database=db,
          public_store=public_store,