chg: Moved signal processor loading to app_config.ready

Thanks to @claudep for the patch

Closes django-haystack#1260

Author: acdha

haystack/__init__.py

@@ -2,8 +2,6 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-import logging
-
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
@@ -15,12 +13,7 @@
 __author__ = 'Daniel Lindsley'
 __version__ = (2, 5, 'dev0')
 
-
-# Setup default logging.
-log = logging.getLogger('haystack')
-stream = logging.StreamHandler()
-stream.setLevel(logging.INFO)
-log.addHandler(stream)
+default_app_config = 'haystack.apps.HaystackConfig'
 
 
 # Help people clean up from 1.X.
@@ -51,11 +44,6 @@
 # Load the router(s).
 connection_router = loading.ConnectionRouter()
 
-# Setup the signal processor.
-signal_processor_path = getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', 'haystack.signals.BaseSignalProcessor')
-signal_processor_class = loading.import_class(signal_processor_path)
-signal_processor = signal_processor_class(connections, connection_router)
-
 
 # Per-request, reset the ghetto query log.
 # Probably not extraordinarily thread-safe but should only matter when

haystack/apps.py

@@ -0,0 +1,28 @@
+from __future__ import unicode_literals
+
+import logging
+
+from django.apps import AppConfig
+from django.conf import settings
+
+from haystack import connection_router, connections
+from haystack.utils import loading
+
+
+class HaystackConfig(AppConfig):
+    name = 'haystack'
+    signal_processor = None
+    stream = None
+
+    def ready(self):
+        # Setup default logging.
+        log = logging.getLogger('haystack')
+        self.stream = logging.StreamHandler()
+        self.stream.setLevel(logging.INFO)
+        log.addHandler(self.stream)
+
+        # Setup the signal processor.
+        if not self.signal_processor:
+            signal_processor_path = getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', 'haystack.signals.BaseSignalProcessor')
+            signal_processor_class = loading.import_class(signal_processor_path)
+            self.signal_processor = signal_processor_class(connections, connection_router)

test_haystack/elasticsearch_tests/test_elasticsearch_backend.py

@@ -8,6 +8,7 @@
 from decimal import Decimal
 
 import elasticsearch
+from django.apps import apps
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -16,7 +17,7 @@
 from haystack.exceptions import SkipDocument
 from haystack.inputs import AutoQuery
 from haystack.models import SearchResult
-from haystack.query import RelatedSearchQuerySet, SearchQuerySet, SQ
+from haystack.query import SQ, RelatedSearchQuerySet, SearchQuerySet
 from haystack.utils import log as logging
 from haystack.utils.geo import Point
 from haystack.utils.loading import UnifiedIndex
@@ -569,8 +570,8 @@ def setUp(self):
         settings.HAYSTACK_CONNECTIONS['elasticsearch']['URL'] = "%s/foo/" % self.old_es_url
         self.cap = CaptureHandler()
         logging.getLogger('haystack').addHandler(self.cap)
-        import haystack
-        logging.getLogger('haystack').removeHandler(haystack.stream)
+        config = apps.get_app_config('haystack')
+        logging.getLogger('haystack').removeHandler(config.stream)
 
         # Setup the rest of the bits.
         self.old_ui = connections['elasticsearch'].get_unified_index()
@@ -581,12 +582,12 @@ def setUp(self):
         self.sb = connections['elasticsearch'].get_backend()
 
     def tearDown(self):
-        import haystack
         # Restore.
         settings.HAYSTACK_CONNECTIONS['elasticsearch']['URL'] = self.old_es_url
         connections['elasticsearch']._index = self.old_ui
+        config = apps.get_app_config('haystack')
         logging.getLogger('haystack').removeHandler(self.cap)
-        logging.getLogger('haystack').addHandler(haystack.stream)
+        logging.getLogger('haystack').addHandler(config.stream)
 
     @unittest.expectedFailure
     def test_all_cases(self):

test_haystack/multipleindex/__init__.py

@@ -5,19 +5,19 @@
 import haystack
 from haystack.signals import RealtimeSignalProcessor
 
-from django.db.models import signals
+from django.apps import apps
 
 from ..utils import check_solr
 
 _old_sp = None
 def setup():
     check_solr()
     global _old_sp
-    _old_sp = haystack.signal_processor
-    haystack.signal_processor = RealtimeSignalProcessor(haystack.connections, haystack.connection_router)
+    config = apps.get_app_config('haystack')
+    _old_sp = config.signal_processor
+    config.signal_processor = RealtimeSignalProcessor(haystack.connections, haystack.connection_router)
 
 def teardown():
-    haystack.signal_processor = _old_sp
-    signals.post_save.receivers = []
-    signals.post_delete.receivers = []
-
+    config = apps.get_app_config('haystack')
+    config.signal_processor.teardown()
+    config.signal_processor = _old_sp