From ac407bf48a557292a54aff0595e7a16dcfaf9b00 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Thu, 3 Jun 2021 11:09:07 -0400 Subject: [PATCH] island: Remove unused mongo_url from BootloaderHttpServer constructor --- monkey/monkey_island/cc/server_setup.py | 8 +++----- monkey/monkey_island/cc/server_utils/bootloader_server.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py index 2e1cb2ebe..c9b5df436 100644 --- a/monkey/monkey_island/cc/server_setup.py +++ b/monkey/monkey_island/cc/server_setup.py @@ -92,7 +92,7 @@ def _start_island_server(should_setup_only, config_options: IslandConfigOptions) logger.warning("Setup only flag passed. Exiting.") return - bootloader_server_thread = _start_bootloader_server(MONGO_URL) + bootloader_server_thread = _start_bootloader_server() if env_singleton.env.is_debug(): app.run(host="0.0.0.0", debug=True, ssl_context=(crt_path, key_path)) @@ -109,10 +109,8 @@ def _start_island_server(should_setup_only, config_options: IslandConfigOptions) bootloader_server_thread.join() -def _start_bootloader_server(mongo_url) -> Thread: - bootloader_server_thread = Thread( - target=BootloaderHttpServer(mongo_url).serve_forever, daemon=True - ) +def _start_bootloader_server() -> Thread: + bootloader_server_thread = Thread(target=BootloaderHttpServer().serve_forever, daemon=True) bootloader_server_thread.start() diff --git a/monkey/monkey_island/cc/server_utils/bootloader_server.py b/monkey/monkey_island/cc/server_utils/bootloader_server.py index d43d9318b..bfdd42cf2 100644 --- a/monkey/monkey_island/cc/server_utils/bootloader_server.py +++ b/monkey/monkey_island/cc/server_utils/bootloader_server.py @@ -15,7 +15,7 @@ logger = logging.getLogger(__name__) class BootloaderHttpServer(ThreadingMixIn, HTTPServer): - def __init__(self, mongo_url): + def __init__(self): server_address = ("", 5001) super().__init__(server_address, BootloaderHTTPRequestHandler)