diff --git a/monkey/infection_monkey/master/automated_master.py b/monkey/infection_monkey/master/automated_master.py index 7fd943932..1873ecea0 100644 --- a/monkey/infection_monkey/master/automated_master.py +++ b/monkey/infection_monkey/master/automated_master.py @@ -3,8 +3,6 @@ import threading import time from typing import Any, Callable, Dict, Iterable, List, Mapping, Optional, Tuple -from utils.propagation import should_propagate - from common.utils import Timer from infection_monkey.credential_store import ICredentialsStore from infection_monkey.i_control_channel import IControlChannel, IslandCommunicationError @@ -15,6 +13,7 @@ from infection_monkey.network import NetworkInterface from infection_monkey.telemetry.credentials_telem import CredentialsTelem from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger from infection_monkey.telemetry.post_breach_telem import PostBreachTelem +from infection_monkey.utils.propagation import should_propagate from infection_monkey.utils.threading import create_daemon_thread, interruptible_iter from . import Exploiter, IPScanner, Propagator diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py index 8b8d8e600..e02e4e2eb 100644 --- a/monkey/infection_monkey/monkey.py +++ b/monkey/infection_monkey/monkey.py @@ -78,8 +78,8 @@ from infection_monkey.utils.monkey_dir import ( remove_monkey_dir, ) from infection_monkey.utils.monkey_log_path import get_agent_log_path +from infection_monkey.utils.propagation import should_propagate from infection_monkey.utils.signal_handler import register_signal_handlers, reset_signal_handlers -from utils.propagation import should_propagate logger = logging.getLogger(__name__) logging.getLogger("urllib3").setLevel(logging.INFO)