p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Fix some logic caused by rebase

This commit is contained in:
Shreya Malviya 2022-09-27 16:17:04 +05:30
parent aeef2cdcbe
commit 6d63f3c378
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/infection_monkey/monkey.py
View File

@ -127,7 +127,7 @@ class InfectionMonkey:
self._control_client = ControlClient( self._control_client = ControlClient(
server_address=str(server), island_api_client=self._island_api_client server_address=str(server), island_api_client=self._island_api_client
) )
self._control_channel = ControlChannel(server, get_agent_id(), self._island_api_client) self._control_channel = ControlChannel(str(server), get_agent_id(), self._island_api_client)
self._register_agent(self._island_address) self._register_agent(self._island_address)
# TODO Refactor the telemetry messengers to accept control client # TODO Refactor the telemetry messengers to accept control client

3
monkey/infection_monkey/network/relay/utils.py
View File

@ -80,11 +80,10 @@ def _check_if_island_server(
def send_remove_from_waitlist_control_message_to_relays(servers: Iterable[SocketAddress]): def send_remove_from_waitlist_control_message_to_relays(servers: Iterable[SocketAddress]):
for i, server in enumerate(servers, start=1): for i, server in enumerate(servers, start=1):
server_address = SocketAddress.from_string(server)
t = create_daemon_thread( t = create_daemon_thread(
target=notify_disconnect, target=notify_disconnect,
name=f"SendRemoveFromWaitlistControlMessageToRelaysThread-{i:02d}", name=f"SendRemoveFromWaitlistControlMessageToRelaysThread-{i:02d}",
args=(server_address,), args=(server,),
) )
t.start() t.start()