From fd7a00a2259906e95d706ed8b05dfac672568900 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 12 Sep 2022 11:20:17 -0400 Subject: [PATCH] Island: Rename subscribe_to_topics() -> setup_island_event_subscribers() --- monkey/monkey_island/cc/__init__.py | 2 +- monkey/monkey_island/cc/server_setup.py | 4 ++-- monkey/monkey_island/cc/subscribe_to_topics.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monkey/monkey_island/cc/__init__.py b/monkey/monkey_island/cc/__init__.py index 89172f65f..7ab52f48a 100644 --- a/monkey/monkey_island/cc/__init__.py +++ b/monkey/monkey_island/cc/__init__.py @@ -1,2 +1,2 @@ from .version import Version -from .subscribe_to_topics import subscribe_to_topics +from .subscribe_to_topics import setup_island_event_subscribers diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py index b297cae42..ba36ec562 100644 --- a/monkey/monkey_island/cc/server_setup.py +++ b/monkey/monkey_island/cc/server_setup.py @@ -10,7 +10,7 @@ import gevent.hub import requests from gevent.pywsgi import WSGIServer -from monkey_island.cc import Version, subscribe_to_topics +from monkey_island.cc import Version, setup_island_event_subscribers from monkey_island.cc.deployment import Deployment from monkey_island.cc.server_utils.consts import ISLAND_PORT from monkey_island.cc.server_utils.island_logger import get_log_file_path @@ -62,7 +62,7 @@ def run_monkey_island(): _initialize_mongodb_connection(config_options.start_mongodb, config_options.data_dir) _start_island_server(ip_addresses, island_args.setup_only, config_options, container) - subscribe_to_topics(container) + setup_island_event_subscribers(container) def _extract_config(island_args: IslandCmdArgs) -> IslandConfigOptions: diff --git a/monkey/monkey_island/cc/subscribe_to_topics.py b/monkey/monkey_island/cc/subscribe_to_topics.py index ef5154084..7a7afc9cc 100644 --- a/monkey/monkey_island/cc/subscribe_to_topics.py +++ b/monkey/monkey_island/cc/subscribe_to_topics.py @@ -3,7 +3,7 @@ from monkey_island.cc.event_queue import IslandEventTopic, PyPubSubIslandEventQu from monkey_island.cc.services.reset_agent_configuration import reset_agent_configuration -def subscribe_to_topics(container: DIContainer): +def setup_island_event_subscribers(container: DIContainer): event_queue = container.resolve(PyPubSubIslandEventQueue) event_queue.subscribe(