From d1199fdab2478e74531b5ba06fefaba139619270 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Tue, 27 Sep 2022 13:06:29 +0530 Subject: [PATCH] Agent: Simplify relay disconnect logic in network/relay/utils.py --- monkey/infection_monkey/network/relay/utils.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/monkey/infection_monkey/network/relay/utils.py b/monkey/infection_monkey/network/relay/utils.py index 0f20a91e3..86dff8ed6 100644 --- a/monkey/infection_monkey/network/relay/utils.py +++ b/monkey/infection_monkey/network/relay/utils.py @@ -79,18 +79,15 @@ def _check_if_island_server( def send_remove_from_waitlist_control_message_to_relays(servers: Iterable[str]): for i, server in enumerate(servers, start=1): + server_address = SocketAddress.from_string(server) t = create_daemon_thread( - target=_send_remove_from_waitlist_control_message_to_relay, + target=notify_disconnect, name=f"SendRemoveFromWaitlistControlMessageToRelaysThread-{i:02d}", - args=(server,), + args=(server_address,), ) t.start() -def _send_remove_from_waitlist_control_message_to_relay(server: str): - notify_disconnect(SocketAddress.from_string(server)) - - def notify_disconnect(server_address: SocketAddress): """ Tell upstream relay that we no longer need the relay