matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ununsed task.

Browse Source
This commit is contained in:
Roberto Rosario
2016-11-14 02:36:05 -04:00
parent a335f39e2a
commit 7adf3621b7
2 changed files with 1 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/documents/literals.py
View File

@@ -16,7 +16,6 @@ DOCUMENT_IMAGE_TASK_TIMEOUT = 20
STUB_EXPIRATION_INTERVAL = 60 * 60 * 24 # 24 hours
UPDATE_PAGE_COUNT_RETRY_DELAY = 10
UPLOAD_NEW_VERSION_RETRY_DELAY = 10
NEW_DOCUMENT_RETRY_DELAY = 10
PAGE_RANGE_ALL = 'all'
PAGE_RANGE_RANGE = 'range'

53
mayan/apps/documents/tasks.py
View File

@@ -9,8 +9,7 @@ from django.db import OperationalError
from mayan.celery import app
from .literals import (
UPDATE_PAGE_COUNT_RETRY_DELAY, UPLOAD_NEW_VERSION_RETRY_DELAY,
NEW_DOCUMENT_RETRY_DELAY
UPDATE_PAGE_COUNT_RETRY_DELAY, UPLOAD_NEW_VERSION_RETRY_DELAY
)
logger = logging.getLogger(__name__)
@@ -85,56 +84,6 @@ def task_update_page_count(self, version_id):
raise self.retry(exc=exception)
@app.task(bind=True, default_retry_delay=NEW_DOCUMENT_RETRY_DELAY, ignore_result=True)
def task_upload_new_document(self, document_type_id, shared_uploaded_file_id, description=None, label=None, language=None, user_id=None):
SharedUploadedFile = apps.get_model(
app_label='common', model_name='SharedUploadedFile'
)
DocumentType = apps.get_model(
app_label='documents', model_name='DocumentType'
)
try:
document_type = DocumentType.objects.get(pk=document_type_id)
shared_file = SharedUploadedFile.objects.get(
pk=shared_uploaded_file_id
)
if user_id:
user = get_user_model().objects.get(pk=user_id)
else:
user = None
except OperationalError as exception:
logger.warning(
'Operational error during attempt to gather data for new '
'document: %s; Retrying.', exception
)
raise self.retry(exc=exception)
try:
with shared_file.open as file_object:
document_version = document_type.new_document(
self, file_object=file_object, label=label,
description=description, language=language, _user=user
)
except OperationalError as exception:
logger.warning(
'Operational error during attempt to gather data for new '
'document: %s; Retrying.', exception
)
raise self.retry(exc=exception)
try:
shared_file.delete()
except OperationalError as exception:
logger.warning(
'Operational error while trying to delete shared file used to '
'upload new document: %s; %s. Retrying.',
document_version.document, exception
)
@app.task(bind=True, default_retry_delay=UPLOAD_NEW_VERSION_RETRY_DELAY, ignore_result=True)
def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id, comment=None):
SharedUploadedFile = apps.get_model(