From 0a9caf75c9c2166bc5c8875408bd9884313d12c1 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Tue, 30 Nov 2021 16:49:44 +0100 Subject: [PATCH] fix: [sync client] don't launch client if ail server not linked with a sync queue --- bin/core/ail_2_ail.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/core/ail_2_ail.py b/bin/core/ail_2_ail.py index 78e8c20b..7cb32e69 100755 --- a/bin/core/ail_2_ail.py +++ b/bin/core/ail_2_ail.py @@ -267,7 +267,7 @@ def refresh_ail_instance_connection(ail_uuid): client_id = clients_id[0] else: client_id = None - launch_required = is_ail_instance_push_enabled(ail_uuid) + launch_required = is_ail_instance_push_enabled(ail_uuid) and is_ail_instance_linked_to_sync_queue(ail_uuid) # relaunch if client_id and launch_required: @@ -312,7 +312,7 @@ class AIL2AILClientManager(object): def get_all_sync_clients_to_launch(self): ail_instances_to_launch = [] for ail_uuid in get_all_ail_instance(): - if is_ail_instance_push_enabled(ail_uuid): + if is_ail_instance_push_enabled(ail_uuid) and is_ail_instance_linked_to_sync_queue(ail_uuid): ail_instances_to_launch.append(ail_uuid) return ail_instances_to_launch @@ -466,6 +466,9 @@ def is_ail_instance_sync_enabled(ail_uuid, sync_mode=None): else: return False +def is_ail_instance_linked_to_sync_queue(ail_uuid): + return r_serv_sync.exists(f'ail:instance:sync_queue:{ail_uuid}') + def change_pull_push_state(ail_uuid, pull=None, push=None): edited = False curr_pull = is_ail_instance_pull_enabled(ail_uuid)