diff options
| author | Joar Wandborg <joar@wandborg.se> | 2013-02-24 00:23:05 +0100 |
|---|---|---|
| committer | Joar Wandborg <joar@wandborg.se> | 2013-03-03 00:46:05 +0100 |
| commit | 40ef3f5e05f5db071566a5caf55a7b1264ae083d (patch) | |
| tree | c465e3d8cb7a51e1fc7ccf558a27258fadcac308 | |
| parent | 35f1f75922a106ec54ddd279e2939b3ce82b9332 (diff) | |
| download | mediagoblin-40ef3f5e05f5db071566a5caf55a7b1264ae083d.tar.lz mediagoblin-40ef3f5e05f5db071566a5caf55a7b1264ae083d.tar.xz mediagoblin-40ef3f5e05f5db071566a5caf55a7b1264ae083d.zip | |
plugin/raven: Fix paster's celery config issue
Check for CELERY_CONFIG_MODULE before we import raven.contrib.celery. It
seems that the import otherwise sets up the celery client before we get
to pass it our mediagoblin-specific settings.
| -rw-r--r-- | mediagoblin/plugins/raven/__init__.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/plugins/raven/__init__.py b/mediagoblin/plugins/raven/__init__.py index a0e83c0a..16b3b94b 100644 --- a/mediagoblin/plugins/raven/__init__.py +++ b/mediagoblin/plugins/raven/__init__.py @@ -18,13 +18,17 @@ import os import logging from mediagoblin.tools import pluginapi -from raven import Client -from raven.contrib.celery import register_signal _log = logging.getLogger(__name__) def setup_plugin(): + if not os.environ.get('CELERY_CONFIG_MODULE'): + # Exit early if we're (seemingly) not called from the celery process + return + + from raven import Client + from raven.contrib.celery import register_signal config = pluginapi.get_config('mediagoblin.plugins.raven') _log.info('Setting up raven for celery...') |