Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Agent: Format config log messages so they are readable #1283

Merged
merged 1 commit into from
Jun 30, 2021
Merged

Agent: Format config log messages so they are readable #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions monkey/infection_monkey/control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import logging
import platform
from pprint import pformat
from socket import gethostname
from urllib.parse import urljoin

Expand Down Expand Up @@ -206,10 +207,10 @@ def load_control_config():

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(
Expand Down
7 changes: 3 additions & 4 deletions monkey/infection_monkey/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import sys
import traceback
from multiprocessing import freeze_support
from pprint import pformat

# dummy import for pyinstaller
# noinspection PyUnresolvedReferences
Expand Down Expand Up @@ -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 = (
Expand Down