From 1e21446bb8565bf18d5a089a2902f59bbcd1c082 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 2 Jun 2021 15:16:18 -0400 Subject: [PATCH] island: Rename logging_dir_path -> _logging_dir in MongoDbProcess --- monkey/monkey_island/cc/setup/mongo/mongo_db_process.py | 8 ++++---- monkey/monkey_island/cc/setup/mongo/mongo_setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monkey/monkey_island/cc/setup/mongo/mongo_db_process.py b/monkey/monkey_island/cc/setup/mongo/mongo_db_process.py index 9a514ab9a..96341b7d8 100644 --- a/monkey/monkey_island/cc/setup/mongo/mongo_db_process.py +++ b/monkey/monkey_island/cc/setup/mongo/mongo_db_process.py @@ -13,13 +13,13 @@ TERMINATE_TIMEOUT = 10 class MongoDbProcess: - def __init__(self, db_dir: str, logging_dir_path: str): + def __init__(self, db_dir: str, logging_dir: str): """ @param db_dir: Path where a folder for database contents will be created - @param logging_dir_path: Path to a folder where mongodb logs will be created + @param logging_dir: Path to a folder where mongodb logs will be created """ self._db_dir = db_dir - self.logging_dir_path = logging_dir_path + self._logging_dir = logging_dir self._process = None def start(self): @@ -44,7 +44,7 @@ class MongoDbProcess: mongo_run_cmd = MongoDbProcess._build_mongo_launch_cmd(MONGO_EXECUTABLE_PATH, self._db_dir) logger.info(f"Mongodb will be launched with command: {' '.join(mongo_run_cmd)}.") - mongo_log_path = os.path.join(self.logging_dir_path, MONGO_LOG_FILENAME) + mongo_log_path = os.path.join(self._logging_dir, MONGO_LOG_FILENAME) logger.info(f"Mongodb log will be available at {mongo_log_path}.") with open(mongo_log_path, "w") as log: diff --git a/monkey/monkey_island/cc/setup/mongo/mongo_setup.py b/monkey/monkey_island/cc/setup/mongo/mongo_setup.py index 73ed9d096..2920fc8bb 100644 --- a/monkey/monkey_island/cc/setup/mongo/mongo_setup.py +++ b/monkey/monkey_island/cc/setup/mongo/mongo_setup.py @@ -24,7 +24,7 @@ logger = logging.getLogger(__name__) def start_mongodb(config_options: IslandConfigOptions) -> MongoDbProcess: db_dir = _create_db_dir(config_options.data_dir) - mongo_db_process = MongoDbProcess(db_dir=db_dir, logging_dir_path=config_options.data_dir) + mongo_db_process = MongoDbProcess(db_dir=db_dir, logging_dir=config_options.data_dir) mongo_db_process.start() return mongo_db_process