heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing option to set celery config section.

Browse Source 
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
This commit is contained in:
Christopher Allan Webber 2011-06-18 18:31:56 -05:00
parent d01744dd75
commit 52f20ff337
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/celery_setup/__init__.py
View File

@ -22,6 +22,7 @@ MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media']
DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module' DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module'
def setup_celery_from_config(app_config, global_config, def setup_celery_from_config(app_config, global_config,
settings_module=DEFAULT_SETTINGS_MODULE, settings_module=DEFAULT_SETTINGS_MODULE,
force_celery_always_eager=False, 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. # Don't setup celery based on our config file.
return return
celery_conf_section = app_config.get('celery_section', 'celery') if global_config.has_key('celery'):
if global_config.has_key(celery_conf_section): celery_conf = global_config['celery']
celery_conf = global_config[celery_conf_section]
else: else:
celery_conf = {} celery_conf = {}