Permalink
Browse files

Merge pull request #16 from EnTeQuAk/fix_conf

Do not force signal processor to be celery_haystack.signals
  • Loading branch information...
2 parents 34de9f6 + 4e8d60b commit 46c0c625c76dd75e4e7e2aa9d78162937095fe93 @jezdez jezdez committed Mar 23, 2013
Showing with 6 additions and 5 deletions.
  1. +6 −5 celery_haystack/conf.py
View
11 celery_haystack/conf.py
@@ -41,11 +41,12 @@ def configure(self):
data[name] = value
return data
-if (haystack_version[0] >= 2 and
- getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', None) !=
- 'celery_haystack.signals.CelerySignalProcessor'):
+signal_processor = getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', None)
+
+
+if haystack_version[0] >= 2 and signal_processor is None:
raise ImproperlyConfigured("When using celery-haystack with Haystack 2.X "
"the HAYSTACK_SIGNAL_PROCESSOR setting must be "
- "set to 'celery_haystack.signals."
- "CelerySignalProcessor'.")
+ "set. Use 'celery_haystack.signals."
+ "CelerySignalProcessor' as default.")

0 comments on commit 46c0c62

Please sign in to comment.