p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GC-5050: skip timeouts fix and shorter timeout

This commit is contained in:
urihershgc 2016-01-14 16:14:07 +02:00
parent 6fe21a83e1
commit 0cd5d5aea3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chaos_monkey/monkey.py
View File

@ -103,8 +103,9 @@ class ChaosMonkey(object):
machines = self._network.get_victim_machines(WormConfiguration.scanner_class,
max_find=WormConfiguration.victims_max_find)
is_empty = True
for machine in machines:
is_empty = False
for finger in self._fingerprint:
LOG.info("Trying to get OS fingerprint from %r with module %s",
machine, finger.__class__.__name__)
@ -169,7 +170,7 @@ class ChaosMonkey(object):
else:
self._fail_exploitation_machines.add(machine)
if machines:
if not is_empty:
time.sleep(WormConfiguration.timeout_between_iterations)
if self._keep_running and WormConfiguration.alive:

2
chaos_monkey/tunnel.py
View File

@ -17,7 +17,7 @@ MCAST_GROUP = '224.1.1.1'
MCAST_PORT = 5007
BUFFER_READ = 1024
DEFAULT_TIMEOUT = 10
QUIT_TIMEOUT = 1200 # 20 minutes
QUIT_TIMEOUT = 60 * 10 # 10 minutes
def _set_multicast_socket(timeout=DEFAULT_TIMEOUT):