Merge branch 'develop' of https://github.com/Kronuz/celery-haystack into Kronuz-develop

Conflicts:
	celery_haystack/tasks.py

Author: jezdez

celery_haystack/indexes.py

@@ -25,19 +25,27 @@ def handle_model(self, model):
     # operation.
     def _setup_save(self, model=None):
         model = self.handle_model(model)
-        signals.post_save.connect(self.enqueue_save, sender=model)
+        signals.post_save.connect(self._enqueue_save, sender=model, dispatch_uid=CelerySearchIndex)
 
     def _setup_delete(self, model=None):
         model = self.handle_model(model)
-        signals.post_delete.connect(self.enqueue_delete, sender=model)
+        signals.post_delete.connect(self._enqueue_delete, sender=model, dispatch_uid=CelerySearchIndex)
 
     def _teardown_save(self, model=None):
         model = self.handle_model(model)
-        signals.post_save.disconnect(self.enqueue_save, sender=model)
+        signals.post_save.disconnect(self._enqueue_save, sender=model, dispatch_uid=CelerySearchIndex)
 
     def _teardown_delete(self, model=None):
         model = self.handle_model(model)
-        signals.post_delete.disconnect(self.enqueue_delete, sender=model)
+        signals.post_delete.disconnect(self._enqueue_delete, sender=model, dispatch_uid=CelerySearchIndex)
+
+    def _enqueue_save(self, instance, **kwargs):
+        if not getattr(instance, 'skip_indexing', False):
+            self.enqueue_save(instance, **kwargs)
+
+    def _enqueue_delete(self, instance, **kwargs):
+        if not getattr(instance, 'skip_indexing', False):
+            self.enqueue_delete(instance, **kwargs)
 
     def enqueue_save(self, instance, **kwargs):
         return self.enqueue('update', instance)

celery_haystack/tasks.py

@@ -6,8 +6,7 @@
 from celery_haystack.conf import settings
 
 try:
-    from haystack import connections
-    index_holder = connections['default'].get_unified_index()
+    from haystack import connections, connection_router
     from haystack.exceptions import NotHandled as IndexNotFoundException
     legacy = False
 except ImportError:
@@ -75,10 +74,11 @@ def get_instance(self, model_class, pk, **kwargs):
         logger = self.get_logger(**kwargs)
         instance = None
         try:
-            instance = model_class.objects.get(pk=pk)
+            instance = model_class._default_manager.get(pk=int(pk))
         except model_class.DoesNotExist:
-            logger.error("Couldn't load model instance "
-                         "with pk %s. Somehow it went missing?" % pk)
+            logger.error("Couldn't load %s.%s.%s. Somehow it went missing?" %
+                         (model_class._meta.app_label.lower(),
+                          model_class._meta.object_name.lower(), pk))
         except model_class.MultipleObjectsReturned:
             logger.error("More than one object with pk %s. Oops?" % pk)
         return instance
@@ -88,6 +88,9 @@ def get_index(self, model_class, **kwargs):
         Fetch the model's registered ``SearchIndex`` in a standarized way.
         """
         try:
+            if not legacy:
+                backend_alias = connection_router.for_write(**{'models': [model_class]})
+                index_holder = connections[backend_alias].get_unified_index()
             return index_holder.get_index(model_class)
         except IndexNotFoundException:
             raise ImproperlyConfigured("Couldn't find a SearchIndex for %s." %
@@ -134,7 +137,6 @@ def run(self, action, identifier, **kwargs):
                        (identifier, current_index_name))
                 logger.debug(msg)
                 return msg
-
         elif action == 'update':
             # and the instance of the model class with the pk
             instance = self.get_instance(model_class, pk, **kwargs)