diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-05-04 11:50:39 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-05-04 11:50:39 +0200 |
| commit | 7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97 (patch) | |
| tree | ec4df697d6785da9f1246d3739df1f39bff8141d /mediagoblin/celery_setup/__init__.py | |
| parent | 1b46208f3e6daa773ed0ac2b7c811db68b8b3123 (diff) | |
| parent | 88816492a3776618e2a2a9ad40d49445ebba410d (diff) | |
| download | mediagoblin-7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97.tar.lz mediagoblin-7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97.tar.xz mediagoblin-7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/celery_setup/__init__.py')
| -rw-r--r-- | mediagoblin/celery_setup/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/celery_setup/__init__.py index 3a7f2a5d..551b2741 100644 --- a/mediagoblin/celery_setup/__init__.py +++ b/mediagoblin/celery_setup/__init__.py @@ -70,6 +70,8 @@ def asfloat(obj): "Bad float value: %r" % obj) +MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media'] + DEFAULT_SETTINGS_MODULE = 'mediagoblin.celery_setup.dummy_settings_module' def setup_celery_from_config(app_config, global_config, @@ -130,6 +132,10 @@ def setup_celery_from_config(app_config, global_config, value = aslist(value) celery_settings[key] = value + # add mandatory celery imports + celery_imports = celery_settings.setdefault('CELERY_IMPORTS', []) + celery_imports.extend(MANDATORY_CELERY_IMPORTS) + __import__(settings_module) this_module = sys.modules[settings_module] |