p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

island: Decouple mongo_setup from IslandConfigOptions

This commit is contained in:
Mike Salvatore 2021-06-02 20:12:03 -04:00
parent edbb2c39f3
commit 5f25debfd2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/monkey_island/cc/server_setup.py
View File

@ -48,7 +48,7 @@ def run_monkey_island():
_initialize_global_resources(config_options, server_config_path) _initialize_global_resources(config_options, server_config_path)
if config_options.start_mongodb: if config_options.start_mongodb:
mongo_db_process = start_mongodb(config_options) mongo_db_process = start_mongodb(config_options.data_dir)
register_mongo_shutdown_callback(mongo_db_process) register_mongo_shutdown_callback(mongo_db_process)
connect_to_mongodb() connect_to_mongodb()

7
monkey/monkey_island/cc/setup/mongo/mongo_setup.py
View File

@ -9,7 +9,6 @@ from monkey_island.cc.environment.utils import create_secure_directory
from monkey_island.cc.setup.mongo import mongo_connector from monkey_island.cc.setup.mongo import mongo_connector
from monkey_island.cc.setup.mongo.mongo_connector import MONGO_DB_HOST, MONGO_DB_NAME, MONGO_DB_PORT from monkey_island.cc.setup.mongo.mongo_connector import MONGO_DB_HOST, MONGO_DB_NAME, MONGO_DB_PORT
from monkey_island.cc.setup.mongo.mongo_db_process import MongoDbProcess from monkey_island.cc.setup.mongo.mongo_db_process import MongoDbProcess
from monkey_island.setup.island_config_options import IslandConfigOptions
DB_DIR_NAME = "db" DB_DIR_NAME = "db"
MONGO_URL = os.environ.get( MONGO_URL = os.environ.get(
@ -21,10 +20,10 @@ MINIMUM_MONGO_DB_VERSION_REQUIRED = "4.2.0"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def start_mongodb(config_options: IslandConfigOptions) -> MongoDbProcess: def start_mongodb(data_dir: str) -> MongoDbProcess:
db_dir = _create_db_dir(config_options.data_dir) db_dir = _create_db_dir(data_dir)
mongo_db_process = MongoDbProcess(db_dir=db_dir, logging_dir=config_options.data_dir) mongo_db_process = MongoDbProcess(db_dir=db_dir, logging_dir=data_dir)
mongo_db_process.start() mongo_db_process.start()
return mongo_db_process return mongo_db_process