diff --git a/monkey/monkey_island/cc/resources/island_logs.py b/monkey/monkey_island/cc/resources/island_logs.py index e9eb7ea63..df22ef94f 100644 --- a/monkey/monkey_island/cc/resources/island_logs.py +++ b/monkey/monkey_island/cc/resources/island_logs.py @@ -3,7 +3,7 @@ from pathlib import Path from monkey_island.cc.resources.AbstractResource import AbstractResource from monkey_island.cc.resources.request_authentication import jwt_required -from monkey_island.cc.server_utils.island_logger import get_log_file_contents +from monkey_island.cc.server_utils.file_utils import get_text_file_contents logger = logging.getLogger(__name__) @@ -17,6 +17,6 @@ class IslandLog(AbstractResource): @jwt_required def get(self): try: - return get_log_file_contents(self._island_log_file_path) + return get_text_file_contents(self._island_log_file_path) except Exception: logger.error("Monkey Island logs failed to download", exc_info=True) diff --git a/monkey/monkey_island/cc/server_utils/file_utils.py b/monkey/monkey_island/cc/server_utils/file_utils.py index 73f13e05e..b24142d49 100644 --- a/monkey/monkey_island/cc/server_utils/file_utils.py +++ b/monkey/monkey_island/cc/server_utils/file_utils.py @@ -21,6 +21,12 @@ if is_windows_os(): import monkey_island.cc.server_utils.windows_permissions as windows_permissions +def get_text_file_contents(file_path: Path) -> str: + with open(file_path, "rt") as f: + file_contents = f.read() + return file_contents + + def create_secure_directory(path: Path): if not path.is_dir(): if is_windows_os(): diff --git a/monkey/monkey_island/cc/server_utils/island_logger.py b/monkey/monkey_island/cc/server_utils/island_logger.py index 07090214a..31b2a7a98 100644 --- a/monkey/monkey_island/cc/server_utils/island_logger.py +++ b/monkey/monkey_island/cc/server_utils/island_logger.py @@ -33,12 +33,6 @@ def get_log_file_path(data_dir: Path) -> Path: return data_dir / ISLAND_LOG_FILENAME -def get_log_file_contents(log_file_path: Path) -> str: - with open(log_file_path, "rt") as f: - log_file = f.read() - return log_file - - def setup_default_failsafe_logging(): logger = logging.getLogger() logger.setLevel(logging.DEBUG)