diff --git a/HISTORY.rst b/HISTORY.rst index 2fc1d8f40d..fced11d2d7 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,6 +4,8 @@ * Disable pagination current page button Current page button was clickable and would cause the single page navigation to jump to the home view. +* Remove redundant Celery queue declarations from the + file_metadata app. 3.2.6 (2019-07-10) ================== diff --git a/docs/releases/3.2.7.rst b/docs/releases/3.2.7.rst index c715e88bf5..6cf8841bad 100644 --- a/docs/releases/3.2.7.rst +++ b/docs/releases/3.2.7.rst @@ -11,6 +11,8 @@ Changes - Disable pagination current page button Current page button was clickable and would cause the single page navigation to jump to the home view. +- Remove redundant Celery queue declarations from the + file_metadata app. Removals -------- diff --git a/mayan/apps/file_metadata/apps.py b/mayan/apps/file_metadata/apps.py index 10796b6cf5..a9830d467d 100644 --- a/mayan/apps/file_metadata/apps.py +++ b/mayan/apps/file_metadata/apps.py @@ -4,8 +4,6 @@ from django.apps import apps from django.db.models.signals import post_save from django.utils.translation import ugettext_lazy as _ -from kombu import Exchange, Queue - from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import ModelAttribute, ModelField @@ -18,7 +16,6 @@ from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.documents.signals import post_version_upload from mayan.apps.events.classes import ModelEventType from mayan.apps.navigation.classes import SourceColumn -from mayan.celery import app from .classes import FileMetadataHelper from .dependencies import * # NOQA @@ -150,21 +147,6 @@ class FileMetadataApp(MayanAppConfig): attribute='get_attribute_count', source=DocumentVersionDriverEntry ) - app.conf.CELERY_QUEUES.append( - Queue( - 'file_metadata', Exchange('file_metadata'), - routing_key='file_metadata' - ), - ) - - app.conf.CELERY_ROUTES.update( - { - 'mayan.apps.file_metadata.tasks.task_process_document_version': { - 'queue': 'file_metadata' - }, - } - ) - document_search.add_model_field( field='versions__file_metadata_drivers__entries__key', label=_('File metadata key')