Merge pull request #1283 from guardicore/config-log-formatting

Agent: Format config log messages so they are readable

monkey/infection_monkey/control.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import platform
+from pprint import pformat
 from socket import gethostname
 from urllib.parse import urljoin
 
@@ -206,10 +207,10 @@ class ControlClient(object):
 
         try:
             unknown_variables = WormConfiguration.from_kv(reply.json().get("config"))
-            LOG.info(
-                "New configuration was loaded from server: %r"
-                % (WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict()),)
+            formatted_config = pformat(
+                WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict())
             )
+            LOG.info(f"New configuration was loaded from server:\n{formatted_config}")
         except Exception as exc:
             # we don't continue with default conf here because it might be dangerous
             LOG.error(

monkey/infection_monkey/main.py

@@ -6,6 +6,7 @@ import os
 import sys
 import traceback
 from multiprocessing import freeze_support
+from pprint import pformat
 
 # dummy import for pyinstaller
 # noinspection PyUnresolvedReferences
@@ -76,10 +77,8 @@ def main():
             "default" % (config_file,)
         )
 
-    print(
-        "Loaded Configuration: %r"
-        % WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict())
-    )
+    formatted_config = pformat(WormConfiguration.hide_sensitive_info(WormConfiguration.as_dict()))
+    print(f"Loaded Configuration:\n{formatted_config}")
 
     # Make sure we're not in a machine that has the kill file
     kill_path = (