From 4b6c826574ac2db13487cfa5d575cf9c5ff479ed Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 7 Oct 2014 19:38:14 -0400 Subject: [PATCH] Increase timeouts for the image conversion tasks --- mayan/apps/documents/api_views.py | 2 +- mayan/apps/documents/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mayan/apps/documents/api_views.py b/mayan/apps/documents/api_views.py index 775c893a4e..da2f945a85 100644 --- a/mayan/apps/documents/api_views.py +++ b/mayan/apps/documents/api_views.py @@ -30,7 +30,7 @@ from .serializers import (DocumentImageSerializer, DocumentPageSerializer, from .settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL from .tasks import task_get_document_image -DOCUMENT_IMAGE_TASK_TIMEOUT = 2 +DOCUMENT_IMAGE_TASK_TIMEOUT = 10 class APIDocumentListView(generics.ListCreateAPIView): diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 4571976a05..f49140f379 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -289,7 +289,7 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE): rotation = int(request.GET.get('rotation', DEFAULT_ROTATION)) % 360 task = task_get_document_image.apply_async(kwargs=dict(document_id=document.pk, size=size, page=page, zoom=zoom, rotation=rotation, as_base64=False, version=version), queue='converter') - return sendfile.sendfile(request, task.get(timeout=1), mimetype=DEFAULT_FILE_FORMAT_MIMETYPE) + return sendfile.sendfile(request, task.get(timeout=10), mimetype=DEFAULT_FILE_FORMAT_MIMETYPE) def document_download(request, document_id=None, document_id_list=None, document_version_pk=None):