From 3d938f253627ee5fd6764b422481e90e97c03051 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 31 Mar 2021 11:55:21 -0400 Subject: [PATCH] cc: Fix come incorrect import paths --- monkey/monkey_island.py | 2 +- monkey/monkey_island/cc/arg_parser.py | 2 +- monkey/monkey_island/cc/environment/set_server_config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monkey/monkey_island.py b/monkey/monkey_island.py index 1261af888..88e41b6e2 100644 --- a/monkey/monkey_island.py +++ b/monkey/monkey_island.py @@ -6,7 +6,7 @@ gevent_monkey.patch_all() import json # noqa: E402 -from monkey_island.cc.island_logger import json_setup_logging # noqa: E402 +from monkey_island.cc.server_utils.island_logger import json_setup_logging # noqa: E402 if "__main__" == __name__: diff --git a/monkey/monkey_island/cc/arg_parser.py b/monkey/monkey_island/cc/arg_parser.py index 8716a9b4a..5ea12aec4 100644 --- a/monkey/monkey_island/cc/arg_parser.py +++ b/monkey/monkey_island/cc/arg_parser.py @@ -1,6 +1,6 @@ from dataclasses import dataclass -from monkey_island.cc.consts import DEFAULT_SERVER_CONFIG_PATH, DEFAULT_LOGGER_CONFIG_PATH +from monkey_island.cc.server_utils.consts import DEFAULT_SERVER_CONFIG_PATH, DEFAULT_LOGGER_CONFIG_PATH @dataclass diff --git a/monkey/monkey_island/cc/environment/set_server_config.py b/monkey/monkey_island/cc/environment/set_server_config.py index 2bb4336ae..f3fbd66ff 100644 --- a/monkey/monkey_island/cc/environment/set_server_config.py +++ b/monkey/monkey_island/cc/environment/set_server_config.py @@ -14,7 +14,7 @@ def add_monkey_dir_to_sys_path(): add_monkey_dir_to_sys_path() -from monkey_island.cc.consts import DEFAULT_SERVER_CONFIG_PATH # noqa: E402 isort:skip +from monkey_island.cc.server_utils.consts import DEFAULT_SERVER_CONFIG_PATH # noqa: E402 isort:skip SERVER_CONFIG = "server_config" BACKUP_CONFIG_FILENAME = "./server_config.backup"