p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Fixed bugs merge bugs where structures are being accessed in an outdated ways

This commit is contained in:
VakarisZ 2021-05-24 16:44:43 +03:00
parent 0a7cf1d5ee
commit 2b257f0012
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/monkey_island.py
View File

@ -15,8 +15,8 @@ if "__main__" == __name__:
# This is here in order to catch EVERYTHING, some functions are being called on # This is here in order to catch EVERYTHING, some functions are being called on
# imports, so the log init needs to be first. # imports, so the log init needs to be first.
try: try:
if island_args.server_config: if island_args.server_config_path:
config, server_config_path = setup_config_by_cmd_arg(island_args.server_config) config, server_config_path = setup_config_by_cmd_arg(island_args.server_config_path)
else: else:
config, server_config_path = setup_default_config() config, server_config_path = setup_default_config()

2
monkey/monkey_island/setup/config_setup.py
View File

@ -11,7 +11,7 @@ def setup_config_by_cmd_arg(server_config_path) -> Tuple[IslandConfigOptions, st
server_config_path = os.path.expandvars(os.path.expanduser(server_config_path)) server_config_path = os.path.expandvars(os.path.expanduser(server_config_path))
config = server_config_handler.load_server_config_from_file(server_config_path) config = server_config_handler.load_server_config_from_file(server_config_path)
create_data_dir(config["data_dir"], create_parent_dirs=True) create_data_dir(config.data_dir, create_parent_dirs=True)
return config, server_config_path return config, server_config_path