From 5ea241f120e1276098f475db53bbf0efa2c43a8f Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Tue, 11 May 2021 13:29:53 -0400
Subject: [PATCH] island: Simplify logic in add_default_values_to_config()

---
 monkey/monkey_island/config_loader.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/monkey/monkey_island/config_loader.py b/monkey/monkey_island/config_loader.py
index 5cdb149b7..aaa9185d7 100644
--- a/monkey/monkey_island/config_loader.py
+++ b/monkey/monkey_island/config_loader.py
@@ -17,10 +17,9 @@ def load_server_config_from_file(server_config_path):
 
 def add_default_values_to_config(config):
     config["data_dir"] = os.path.abspath(
-        os.path.expanduser(
-            os.path.expandvars(config["data_dir"] if "data_dir" in config else DEFAULT_DATA_DIR)
-        )
+        os.path.expanduser(os.path.expandvars(config.get("data_dir", DEFAULT_DATA_DIR)))
     )
-    config["log_level"] = config["log_level"] if "log_level" in config else DEFAULT_LOG_LEVEL
+
+    config.setdefault("log_level", DEFAULT_LOG_LEVEL)
 
     return config