diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 18:31:56 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 18:31:56 -0500 |
| commit | 52f20ff33715225d45aead9678701915f3e32706 (patch) | |
| tree | 666d4803394d156c9aee9d65c5b8190150fa7402 | |
| parent | d01744dd750e7f20d11fabe24b553281a1eff2f1 (diff) | |
| download | mediagoblin-52f20ff33715225d45aead9678701915f3e32706.tar.lz mediagoblin-52f20ff33715225d45aead9678701915f3e32706.tar.xz mediagoblin-52f20ff33715225d45aead9678701915f3e32706.zip | |
Removing option to set celery config section.
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
| -rw-r--r-- | mediagoblin/celery_setup/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/celery_setup/__init__.py index 3a9efeaf..e9195ab2 100644 --- a/mediagoblin/celery_setup/__init__.py +++ b/mediagoblin/celery_setup/__init__.py @@ -22,6 +22,7 @@ MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media'] DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module' + def setup_celery_from_config(app_config, global_config, settings_module=DEFAULT_SETTINGS_MODULE, force_celery_always_eager=False, @@ -43,9 +44,8 @@ def setup_celery_from_config(app_config, global_config, # Don't setup celery based on our config file. return - celery_conf_section = app_config.get('celery_section', 'celery') - if global_config.has_key(celery_conf_section): - celery_conf = global_config[celery_conf_section] + if global_config.has_key('celery'): + celery_conf = global_config['celery'] else: celery_conf = {} |