diff --git a/ESSArch_Core/WorkflowEngine/models.py b/ESSArch_Core/WorkflowEngine/models.py index 0af90768a..6e4f32551 100644 --- a/ESSArch_Core/WorkflowEngine/models.py +++ b/ESSArch_Core/WorkflowEngine/models.py @@ -787,10 +787,11 @@ def revoke(self): current_app.control.revoke(str(self.celery_id), terminate=True) self.status = celery_states.REVOKED self.save() - time.sleep(5) if self.information_package and self.information_package.is_locked(): - self.information_package.clear_lock() - logger.info('When task ({}) revoked, unlocked ip {}'.format(self.pk, self.information_package)) + time.sleep(5) + if self.information_package.is_locked(): + self.information_package.clear_lock() + logger.info('When task ({}) revoked, unlocked ip {}'.format(self.pk, self.information_package)) def retry(self): """ diff --git a/ESSArch_Core/config/settings.py b/ESSArch_Core/config/settings.py index 855b57452..da5663593 100644 --- a/ESSArch_Core/config/settings.py +++ b/ESSArch_Core/config/settings.py @@ -522,7 +522,7 @@ DOCS_ROOT = os.path.join(BASE_DIR, 'docs/_build/{lang}/html') # Celery settings -CELERY_IMPORTS = ( +CELERY_IMPORTS = [ "ESSArch_Core.fixity.action.tasks", "ESSArch_Core.ip.tasks", "ESSArch_Core.maintenance.tasks", @@ -532,7 +532,7 @@ "ESSArch_Core.tasks", "ESSArch_Core.workflow.tasks", "ESSArch_Core.WorkflowEngine.tests.tasks", -) +] try: from local_essarch_settings import RABBITMQ_URL except ImportError: diff --git a/requirements/base.txt b/requirements/base.txt index 51e807c9d..8c2fc211e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,6 +1,6 @@ asgiref==3.9.1 boto3==1.42.18 -celery[tblib]==5.6.1 +celery[tblib]==5.6.0 cffi==2.0.0 channels==4.3.2 channels-redis==4.3.0