Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ESSArch_Core/WorkflowEngine/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
4 changes: 2 additions & 2 deletions ESSArch_Core/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading