Close issue #106, Convert document indexing app actions to Celery

mayan/apps/document_indexing/__init__.py

@@ -11,7 +11,6 @@ from navigation.api import register_links, register_top_menu
 from project_setup.api import register_setup
 from rest_api.classes import APIEndPoint
 
-from .api import update_indexes, delete_indexes
 from .links import (document_index_list, document_index_main_menu_link,
                     index_parent, index_setup, index_setup_create,
                     index_setup_document_types, index_setup_delete,
@@ -19,27 +18,28 @@ from .links import (document_index_list, document_index_main_menu_link,
                     rebuild_index_instances, template_node_create,
                     template_node_delete, template_node_edit)
 from .models import Index, IndexTemplateNode, IndexInstanceNode
+from .tasks import task_delete_indexes, task_update_indexes
 
 
 @receiver(pre_delete, dispatch_uid='document_index_delete', sender=Document)
 def document_index_delete(sender, **kwargs):
-    delete_indexes(kwargs['instance'])
+    task_delete_indexes.apply_async(kwargs=dict(document_id=kwargs['instance'].pk), queue='indexing')
 
 
 @receiver(post_save, dispatch_uid='document_metadata_index_update', sender=DocumentMetadata)
 def document_metadata_index_update(sender, **kwargs):
-    delete_indexes(kwargs['instance'].document)
-    update_indexes(kwargs['instance'].document)
+    task_delete_indexes.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
+    task_update_indexes.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
 
 
 @receiver(pre_delete, dispatch_uid='document_metadata_index_delete', sender=DocumentMetadata)
 def document_metadata_index_delete(sender, **kwargs):
-    delete_indexes(kwargs['instance'].document)
+    task_delete_indexes.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
 
 
 @receiver(post_delete, dispatch_uid='document_metadata_index_post_delete', sender=DocumentMetadata)
 def document_metadata_index_post_delete(sender, **kwargs):
-    update_indexes(kwargs['instance'].document)
+    task_update_indexes.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
 
 
 register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes'))

mayan/apps/document_indexing/tasks.py

@@ -0,0 +1,29 @@
+import logging
+
+from django.contrib.auth.models import User
+from django.core.files import File
+
+from mayan.celery import app
+from documents.models import Document
+
+from .api import update_indexes, delete_indexes
+from .tools import do_rebuild_all_indexes
+
+logger = logging.getLogger(__name__)
+
+
+@app.task(ignore_result=True)
+def task_delete_indexes(document_id):
+    document = Document.objects.get(pk=document_id)
+    update_indexes(document)
+
+
+@app.task(ignore_result=True)
+def task_update_indexes(document_id):
+    document = Document.objects.get(pk=document_id)
+    delete_indexes(document)
+
+
+@app.task(ignore_result=True)
+def task_do_rebuild_all_indexes():
+    do_rebuild_all_indexes()

mayan/apps/document_indexing/tools.py

@@ -15,5 +15,3 @@ def do_rebuild_all_indexes():
     DocumentRenameCount.objects.all().delete()
     for document in Document.objects.all():
         update_indexes(document)
-
-    return []  # Warnings - None

mayan/apps/document_indexing/views.py

@@ -28,10 +28,9 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_CREATE,
                           PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES,
                           PERMISSION_DOCUMENT_INDEXING_SETUP,
                           PERMISSION_DOCUMENT_INDEXING_VIEW)
-from .tools import do_rebuild_all_indexes
+from .tasks import task_do_rebuild_all_indexes
 from .widgets import index_instance_item_link, get_breadcrumbs, node_level
 
-
 # Setup views
 
 
@@ -381,17 +380,8 @@ def rebuild_index_instances(request):
             'message': _(u'On large databases this operation may take some time to execute.'),
         }, context_instance=RequestContext(request))
     else:
-        try:
-            warnings = do_rebuild_all_indexes()
-            messages.success(request, _(u'Index rebuild completed successfully.'))
-            for warning in warnings:
-                messages.warning(request, warning)
-
-        except Exception as exception:
-            if settings.DEBUG:
-                raise
-            messages.error(request, _(u'Index rebuild error: %s') % exception)
-
+        task_do_rebuild_all_indexes.apply_async(queue='tools')
+        messages.success(request, _(u'Index rebuild queued successfully.'))
         return HttpResponseRedirect(next)