From 8c7af9a246efee1fdf3e77421b741bb45f811de4 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 7 May 2023 14:47:30 +0200 Subject: [PATCH] Add queue information to user delete task chain --- gnuviechadmin/osusers/signals.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnuviechadmin/osusers/signals.py b/gnuviechadmin/osusers/signals.py index 6aa3c68..3ee4079 100644 --- a/gnuviechadmin/osusers/signals.py +++ b/gnuviechadmin/osusers/signals.py @@ -338,14 +338,17 @@ def handle_user_deleted(sender, instance, **kwargs): } """ - chain = ( - delete_file_mail_userdir.s(instance.username) - | delete_file_sftp_userdir_chained.s() - | delete_ldap_user_chained.s() - ) + file_task_1 = delete_file_mail_userdir.s(instance.username).set(queue="file") + file_task_2 = delete_file_sftp_userdir_chained.s().set(queue="file") + ldap_task_1 = delete_ldap_user_chained.s().set(queue="ldap") + + chain = file_task_1 | file_task_2 | ldap_task_1 _LOGGER.debug("chain signature %s", chain) - taskresult = TaskResult.objects.create_task_result("handle_user_deleted", chain) - _LOGGER.info("LDAP user deletion has been requested in task %s", taskresult.task_id) + task_result = TaskResult.objects.create_task_result("handle_user_deleted", chain) + + _LOGGER.info( + "LDAP user deletion has been requested in task %s", task_result.task_id + ) @receiver(post_delete, sender=AdditionalGroup)