diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-06 14:46:56 +0200 |
| commit | ec8f66bd650e580eae67ad97fbc81776365d84f2 (patch) | |
| tree | 499c0c5ef2868c8f3de724133a9f468122c79589 /mediagoblin/app.py | |
| parent | f4b2bd93f2f9c0f5fbef5214b2fe97912857b175 (diff) | |
| parent | 3aa4c668b9bfe53ed58d4ae21ed91210df7ad9ff (diff) | |
| download | mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.lz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.tar.xz mediagoblin-ec8f66bd650e580eae67ad97fbc81776365d84f2.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 714404de..e5949531 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -139,12 +139,13 @@ def paste_app_factory(global_config, **app_config): raise ImproperlyConfigured( "One of direct_remote_path or direct_remote_paths must be provided") - if asbool(os.environ.get('CELERY_ALWAYS_EAGER')): - setup_celery_from_config( - app_config, global_config, - force_celery_always_eager=True) - else: - setup_celery_from_config(app_config, global_config) + if not asbool(app_config.get('celery_setup_elsewhere')): + if asbool(os.environ.get('CELERY_ALWAYS_EAGER')): + setup_celery_from_config( + app_config, global_config, + force_celery_always_eager=True) + else: + setup_celery_from_config(app_config, global_config) mgoblin_app = MediaGoblinApp( connection, db, |