diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-12 09:16:12 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-12 09:16:12 -0500 |
| commit | da579dec005834f92fb7d968e14610be9936d9a5 (patch) | |
| tree | 5ee9d31e00dc346c1b47ef2a2b49c354546ff09e /mediagoblin/celery_setup/from_celery.py | |
| parent | 2f968422e911e59b40d3334cac366b4dca011fd5 (diff) | |
| parent | e893094a06ab5d659b82c2d2fe646b1545c131dd (diff) | |
| download | mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.tar.lz mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.tar.xz mediagoblin-da579dec005834f92fb7d968e14610be9936d9a5.zip | |
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
Conflicts:
mediagoblin/celery_setup/from_celery.py
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 5fa9ba76..71f93d76 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -26,10 +26,10 @@ 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 @@ -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, |