diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py index 10c25c429c..6ab7e17fd8 100644 --- a/mayan/apps/checkouts/apps.py +++ b/mayan/apps/checkouts/apps.py @@ -16,13 +16,13 @@ from .links import ( link_checkin_document, link_checkout_document, link_checkout_info, link_checkout_list ) +from .literals import CHECK_EXPIRED_CHECK_OUTS_INTERVAL from .models import DocumentCheckout from .permissions import ( permission_document_checkin, permission_document_checkin_override, permission_document_checkout ) -CHECK_EXPIRED_CHECK_OUTS_INTERVAL = 60 # Lowest check out expiration allowed class CheckoutsApp(MayanAppConfig): diff --git a/mayan/apps/checkouts/literals.py b/mayan/apps/checkouts/literals.py index 400423a376..1b4d41e4e3 100644 --- a/mayan/apps/checkouts/literals.py +++ b/mayan/apps/checkouts/literals.py @@ -2,6 +2,9 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ +CHECK_EXPIRED_CHECK_OUTS_INTERVAL = 60 # Lowest check out expiration allowed +CHECKOUT_EXPIRATION_LOCK_EXPIRE = 50 + STATE_CHECKED_OUT = 'checkedout' STATE_CHECKED_IN = 'checkedin' @@ -9,3 +12,4 @@ STATE_LABELS = { STATE_CHECKED_OUT: _('Checked out'), STATE_CHECKED_IN: _('Checked in/available'), } + diff --git a/mayan/apps/checkouts/tasks.py b/mayan/apps/checkouts/tasks.py index a6c561267a..6319a3d261 100644 --- a/mayan/apps/checkouts/tasks.py +++ b/mayan/apps/checkouts/tasks.py @@ -5,9 +5,9 @@ import logging from lock_manager import Lock, LockError from mayan.celery import app +from .literals import CHECKOUT_EXPIRATION_LOCK_EXPIRE from .models import DocumentCheckout -LOCK_EXPIRE = 50 logger = logging.getLogger(__name__) @@ -17,7 +17,7 @@ def task_check_expired_check_outs(): lock_id = 'task_expired_check_outs' try: logger.debug('trying to acquire lock: %s', lock_id) - lock = Lock.acquire_lock(lock_id, LOCK_EXPIRE) + lock = Lock.acquire_lock(name=lock_id, timeout=CHECKOUT_EXPIRATION_LOCK_EXPIRE) logger.debug('acquired lock: %s', lock_id) DocumentCheckout.objects.check_in_expired_check_outs() lock.release()