diff --git a/CHANGELOG.md b/CHANGELOG.md index 4af0e245b..c99303957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/). - The process list collection system info collector to now be a post-breach action. #1697 - The "/api/monkey/download" endpoint to accept an OS and return a file. #1675 - Log messages to contain human-readable thread names. #1766 -- The log file name to `infection-monkey-agent--.log`. #1761 +- The log file name to `infection-monkey-agent--.log`. #1761 ### Removed - VSFTPD exploiter. #1533 diff --git a/docs/content/FAQ/_index.md b/docs/content/FAQ/_index.md index 1c5760549..2478d0e43 100644 --- a/docs/content/FAQ/_index.md +++ b/docs/content/FAQ/_index.md @@ -192,7 +192,7 @@ of directories to find an appropriate place to store the log: - On all other platforms, the directories `/tmp`, `/var/tmp`, and `/usr/tmp`, in that order. 5. As a last resort, the current working directory. -Infection Monkey log file name is constructed to the following pattern: `infection-monkey-agent--.log` +Infection Monkey log file name is constructed to the following pattern: `infection-monkey-agent--.log` The logs contain information about the internals of the Infection Monkey agent's execution. The log will contain entries like these: @@ -217,8 +217,8 @@ The logs contain information about the internals of the Infection Monkey agent's The Infection Monkey leaves hardly any trace on the target system. It will leave: - Log files in [temporary directories]({{< ref "/faq/#infection-monkey-agent-logs">}}): - - Path on Linux: `/tmp/infection-monky-agent--.log` - - Path on Windows: `%temp%\\infection-monky-agent--.log` + - Path on Linux: `/tmp/infection-monky-agent--.log` + - Path on Windows: `%temp%\\infection-monky-agent--.log` ### What's the Infection Monkey Agent's impact on system resources usage? diff --git a/monkey/infection_monkey/utils/monkey_log_path.py b/monkey/infection_monkey/utils/monkey_log_path.py index ef9be4454..b6daa714a 100644 --- a/monkey/infection_monkey/utils/monkey_log_path.py +++ b/monkey/infection_monkey/utils/monkey_log_path.py @@ -7,8 +7,9 @@ from pathlib import Path # Cache the result of the call so that subsequent calls always return the same result @lru_cache(maxsize=None) def _get_log_path(monkey_arg: str) -> Path: - prefix = f"infection-monkey-{monkey_arg}-" - suffix = f"-{time.strftime('%Y-%m-%d-%H-%M-%S', time.gmtime())}.log" + timestamp = time.strftime("%Y-%m-%d-%H-%M-%S", time.gmtime()) + prefix = f"infection-monkey-{monkey_arg}-{timestamp}-" + suffix = ".log" _, monkey_log_path = tempfile.mkstemp(suffix=suffix, prefix=prefix)