From 7967974c9dc1826956e31cdaafce4427e4bfe9f7 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Mon, 1 Aug 2022 17:15:46 +0530 Subject: [PATCH] Island: Move get_log_file_contents() from IslandLog to cc/server_utils/island_logger.py --- monkey/monkey_island/cc/resources/island_logs.py | 8 ++------ monkey/monkey_island/cc/server_utils/island_logger.py | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/monkey/monkey_island/cc/resources/island_logs.py b/monkey/monkey_island/cc/resources/island_logs.py index bb10215fe..c44b80460 100644 --- a/monkey/monkey_island/cc/resources/island_logs.py +++ b/monkey/monkey_island/cc/resources/island_logs.py @@ -3,6 +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 logger = logging.getLogger(__name__) @@ -16,11 +17,6 @@ class IslandLog(AbstractResource): @jwt_required def get(self): try: - return self._get_log_file_contents() + return {"log_file": get_log_file_contents(self._island_log_file_path)} except Exception: logger.error("Monkey Island logs failed to download", exc_info=True) - - def _get_log_file_contents(self): - with open(self._island_log_file_path, "rt") as f: - log_file = f.read() - return {"log_file": log_file} diff --git a/monkey/monkey_island/cc/server_utils/island_logger.py b/monkey/monkey_island/cc/server_utils/island_logger.py index 31b2a7a98..568f4ddef 100644 --- a/monkey/monkey_island/cc/server_utils/island_logger.py +++ b/monkey/monkey_island/cc/server_utils/island_logger.py @@ -2,6 +2,7 @@ import logging import logging.handlers import sys from pathlib import Path +from typing import Mapping ISLAND_LOG_FILENAME = "monkey_island.log" LOG_FORMAT = "%(asctime)s - %(levelname)s - %(filename)s:%(lineno)s - %(funcName)s() - %(message)s" @@ -33,6 +34,12 @@ def get_log_file_path(data_dir: Path) -> Path: return data_dir / ISLAND_LOG_FILENAME +def get_log_file_contents(log_file_path: Path) -> Mapping: + 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)