From 4bc9f735bec07b02fee48892faa9e95b52ade5da Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 12 Sep 2022 11:25:58 -0400 Subject: [PATCH] Island: Rename setup_island_event_{subscribers,handlers} --- monkey/monkey_island/cc/__init__.py | 2 +- monkey/monkey_island/cc/server_setup.py | 4 ++-- ...{subscribe_to_topics.py => setup_island_event_handlers.py} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename monkey/monkey_island/cc/{subscribe_to_topics.py => setup_island_event_handlers.py} (86%) diff --git a/monkey/monkey_island/cc/__init__.py b/monkey/monkey_island/cc/__init__.py index 7ab52f48a..d3308c2c6 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 setup_island_event_subscribers +from .setup_island_event_handlers import setup_island_event_handlers diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py index ba36ec562..5dd55e22e 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, setup_island_event_subscribers +from monkey_island.cc import Version, setup_island_event_handlers 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) - setup_island_event_subscribers(container) + setup_island_event_handlers(container) def _extract_config(island_args: IslandCmdArgs) -> IslandConfigOptions: diff --git a/monkey/monkey_island/cc/subscribe_to_topics.py b/monkey/monkey_island/cc/setup_island_event_handlers.py similarity index 86% rename from monkey/monkey_island/cc/subscribe_to_topics.py rename to monkey/monkey_island/cc/setup_island_event_handlers.py index 7a7afc9cc..03e97db36 100644 --- a/monkey/monkey_island/cc/subscribe_to_topics.py +++ b/monkey/monkey_island/cc/setup_island_event_handlers.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 setup_island_event_subscribers(container: DIContainer): +def setup_island_event_handlers(container: DIContainer): event_queue = container.resolve(PyPubSubIslandEventQueue) event_queue.subscribe(