From 175ffd19f442c9e6f90942bb7077a23c62e1b99d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 7 May 2023 14:41:56 +0200 Subject: [PATCH] Add queue to file server tasks --- gnuviechadmin/osusers/signals.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnuviechadmin/osusers/signals.py b/gnuviechadmin/osusers/signals.py index a817af1..6aa3c68 100644 --- a/gnuviechadmin/osusers/signals.py +++ b/gnuviechadmin/osusers/signals.py @@ -157,22 +157,25 @@ def handle_user_created(sender, instance, created, **kwargs): """ if created: - chain = ( - create_ldap_user.s( - instance.username, - instance.uid, - instance.group.gid, - instance.gecos, - instance.homedir, - instance.shell, - None, - ) - | setup_file_sftp_userdir_chained.s() - | (setup_file_mail_userdir_chained.s()) + task_ldap_1 = create_ldap_user.s( + instance.username, + instance.uid, + instance.group.gid, + instance.gecos, + instance.homedir, + instance.shell, + None, + ).set(queue="ldap") + task_file_1 = setup_file_sftp_userdir_chained.s().set(queue="file") + task_file_2 = setup_file_mail_userdir_chained.s().set(queue="file") + + chain = task_ldap_1 | task_file_1 | task_file_2 + + task_result = TaskResult.objects.create_task_result( + "handle_user_created", chain ) - taskresult = TaskResult.objects.create_task_result("handle_user_created", chain) _LOGGER.info( - "LDAP user creation has been requested in task %s", taskresult.task_id + "LDAP user creation has been requested in task %s", task_result.task_id ) _LOGGER.debug("user %s has been %s", instance, created and "created" or "updated")