diff options
Diffstat (limited to 'mediagoblin/init/celery')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 57 | ||||
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 8 |
2 files changed, 48 insertions, 17 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 29ccd83a..fc595ea7 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -17,28 +17,18 @@ import os import sys +from celery import Celery -MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing'] + +MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing.task'] DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module' -def setup_celery_from_config(app_config, global_config, - settings_module=DEFAULT_SETTINGS_MODULE, - force_celery_always_eager=False, - set_environ=True): +def get_celery_settings_dict(app_config, global_config, + force_celery_always_eager=False): """ - Take a mediagoblin app config and try to set up a celery settings - module from this. - - Args: - - app_config: the application config section - - global_config: the entire ConfigObj loaded config, all sections - - settings_module: the module to populate, as a string - - force_celery_always_eager: whether or not to force celery into - always eager mode; good for development and small installs - - set_environ: if set, this will CELERY_CONFIG_MODULE to the - settings_module + Get a celery settings dictionary from reading the config """ if 'celery' in global_config: celery_conf = global_config['celery'] @@ -61,6 +51,41 @@ def setup_celery_from_config(app_config, global_config, celery_settings['CELERY_ALWAYS_EAGER'] = True celery_settings['CELERY_EAGER_PROPAGATES_EXCEPTIONS'] = True + return celery_settings + + +def setup_celery_app(app_config, global_config, + settings_module=DEFAULT_SETTINGS_MODULE, + force_celery_always_eager=False): + """ + Setup celery without using terrible setup-celery-module hacks. + """ + celery_settings = get_celery_settings_dict( + app_config, global_config, force_celery_always_eager) + celery_app = Celery() + celery_app.config_from_object(celery_settings) + + +def setup_celery_from_config(app_config, global_config, + settings_module=DEFAULT_SETTINGS_MODULE, + force_celery_always_eager=False, + set_environ=True): + """ + Take a mediagoblin app config and try to set up a celery settings + module from this. + + Args: + - app_config: the application config section + - global_config: the entire ConfigObj loaded config, all sections + - settings_module: the module to populate, as a string + - force_celery_always_eager: whether or not to force celery into + always eager mode; good for development and small installs + - set_environ: if set, this will CELERY_CONFIG_MODULE to the + settings_module + """ + celery_settings = get_celery_settings_dict( + app_config, global_config, force_celery_always_eager) + __import__(settings_module) this_module = sys.modules[settings_module] diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 5a44efe3..b8297255 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -24,7 +24,7 @@ OUR_MODULENAME = __name__ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, - default_conf_file='mediagoblin.ini'): + default_conf_file=None): """ Transform this module into a celery config module by reading the mediagoblin config file. Set the environment variable @@ -35,6 +35,12 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, Note that if celery_setup_elsewhere is set in your config file, this simply won't work. """ + if not default_conf_file: + if os.path.exists(os.path.abspath('mediagoblin_local.ini')): + default_conf_file = 'mediagoblin_local.ini' + else: + default_conf_file = 'mediagoblin.ini' + if check_environ_for_conf: mgoblin_conf_file = os.path.abspath( os.environ.get('MEDIAGOBLIN_CONFIG', default_conf_file)) |