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

Silence lock manager model import warning.

Browse Source
This commit is contained in:
Roberto Rosario
2016-03-08 02:32:03 -04:00
parent 927c0bf657
commit ad328b2c3b
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mayan/apps/document_indexing/tasks.py
View File

@@ -6,7 +6,7 @@ from django.apps import apps
from django.db import OperationalError
from mayan.celery import app
from lock_manager import Lock, LockError
from lock_manager import LockError
from .literals import RETRY_DELAY
@@ -18,9 +18,12 @@ def task_delete_empty_index_nodes(self):
IndexInstanceNode = apps.get_model(
app_label='document_indexing', model_name='IndexInstanceNode'
)
Lock = apps.get_model(
app_label='lock_manager', model_name='Lock'
)
try:
rebuild_lock = Lock.acquire_lock(
rebuild_lock = Lock.objects.acquire_lock(
'document_indexing_task_do_rebuild_all_indexes'
)
except LockError as exception:
@@ -43,8 +46,12 @@ def task_index_document(self, document_id):
app_label='document_indexing', model_name='IndexInstanceNode'
)
Lock = apps.get_model(
app_label='lock_manager', model_name='Lock'
)
try:
rebuild_lock = Lock.acquire_lock(
rebuild_lock = Lock.objects.acquire_lock(
'document_indexing_task_do_rebuild_all_indexes'
)
except LockError as exception:
@@ -52,7 +59,7 @@ def task_index_document(self, document_id):
raise self.retry(exc=exception)
else:
try:
lock = Lock.acquire_lock(
lock = Lock.objects.acquire_lock(
'document_indexing_task_update_index_document_%d' % document_id
)
except LockError as exception:
@@ -89,12 +96,16 @@ def task_do_rebuild_all_indexes(self):
app_label='document_indexing', model_name='IndexInstanceNode'
)
Lock = apps.get_model(
app_label='lock_manager', model_name='Lock'
)
if Lock.check_existing(name__startswith='document_indexing_task_update_index_document'):
# A document index update is happening, wait
raise self.retry()
try:
lock = Lock.acquire_lock(
lock = Lock.objects.acquire_lock(
'document_indexing_task_do_rebuild_all_indexes'
)
except LockError as exception: