aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/celery_setup/from_celery.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
-rw-r--r--mediagoblin/celery_setup/from_celery.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py
index 5fa9ba76..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.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
@@ -80,7 +80,7 @@ def setup_self(setup_globals_func=setup_globals):
mgoblin_section.get(
'workbench_path', DEFAULT_WORKBENCH_DIR))
- setup_globals_func(
+ setup_globals(
db_connection=connection,
database=db,
public_store=public_store,