From 4cba1e9327083e47202ad0f32908433ab4f895ea Mon Sep 17 00:00:00 2001 From: Daniel Goldberg Date: Thu, 3 Oct 2019 15:06:18 +0300 Subject: [PATCH] Bugfix. Make both OSes use MT and not MP to avoid pickling issues. --- monkey/infection_monkey/network/network_scanner.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/monkey/infection_monkey/network/network_scanner.py b/monkey/infection_monkey/network/network_scanner.py index f0145e843..d904fce17 100644 --- a/monkey/infection_monkey/network/network_scanner.py +++ b/monkey/infection_monkey/network/network_scanner.py @@ -1,17 +1,12 @@ import time import logging +from multiprocessing.dummy import Pool from common.network.network_range import NetworkRange from infection_monkey.config import WormConfiguration from infection_monkey.model.victim_host_generator import VictimHostGenerator from infection_monkey.network.info import local_ips, get_interfaces_ranges from infection_monkey.network import TcpScanner, PingScanner -from infection_monkey.utils.environment import is_windows_os - -if is_windows_os(): - from multiprocessing.dummy import Pool -else: - from multiprocessing import Pool LOG = logging.getLogger(__name__)