From 8affca84900c1c2e0e99a3fbeac3d8bf95932dd8 Mon Sep 17 00:00:00 2001
From: Ilija Lazoroski <ilija.la@live.com>
Date: Fri, 12 Nov 2021 15:29:31 +0100
Subject: [PATCH] Agent: Always use file logging

---
 monkey/infection_monkey/config.py    |  1 -
 monkey/infection_monkey/example.conf |  1 -
 monkey/infection_monkey/main.py      | 25 +++++++++++--------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
index 117875bb4..24a7d31bd 100644
--- a/monkey/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -77,7 +77,6 @@ class Configuration(object):
     # logging config
     ###########################
 
-    use_file_logging = True
     dropper_log_path_windows = "%temp%\\~df1562.tmp"
     dropper_log_path_linux = "/tmp/user-1562"
     monkey_log_path_windows = "%temp%\\~df1563.tmp"
diff --git a/monkey/infection_monkey/example.conf b/monkey/infection_monkey/example.conf
index 1d3e3235c..5fce5aca5 100644
--- a/monkey/infection_monkey/example.conf
+++ b/monkey/infection_monkey/example.conf
@@ -83,7 +83,6 @@
     8088
   ],
   "timeout_between_iterations": 10,
-  "use_file_logging": true,
   "victims_max_exploit": 100,
   "victims_max_find": 100,
   "post_breach_actions": []
diff --git a/monkey/infection_monkey/main.py b/monkey/infection_monkey/main.py
index 291f35d32..a8db2ab6a 100644
--- a/monkey/infection_monkey/main.py
+++ b/monkey/infection_monkey/main.py
@@ -90,20 +90,17 @@ def main():
     except ValueError:
         return True
 
-    if WormConfiguration.use_file_logging:
-        if os.path.exists(log_path):
-            # If log exists but can't be removed it means other monkey is running. This usually
-            # happens on upgrade
-            # from 32bit to 64bit monkey on Windows. In all cases this shouldn't be a problem.
-            try:
-                os.remove(log_path)
-            except OSError:
-                pass
-        LOG_CONFIG["handlers"]["file"]["filename"] = log_path
-        # noinspection PyUnresolvedReferences
-        LOG_CONFIG["root"]["handlers"].append("file")
-    else:
-        del LOG_CONFIG["handlers"]["file"]
+    if os.path.exists(log_path):
+        # If log exists but can't be removed it means other monkey is running. This usually
+        # happens on upgrade
+        # from 32bit to 64bit monkey on Windows. In all cases this shouldn't be a problem.
+        try:
+            os.remove(log_path)
+        except OSError:
+            pass
+    LOG_CONFIG["handlers"]["file"]["filename"] = log_path
+    # noinspection PyUnresolvedReferences
+    LOG_CONFIG["root"]["handlers"].append("file")
 
     logging.config.dictConfig(LOG_CONFIG)
     logger = logging.getLogger()