Remove lock and add host timeout to NMAP scanner

This commit is contained in:
Paulus Schoutsen 2015-03-25 22:50:51 -07:00
parent c3fc19353b
commit 4484baa866

View File

@ -1,7 +1,6 @@
""" Supports scanning using nmap. """
import logging
from datetime import timedelta, datetime
import threading
from collections import namedtuple
import subprocess
import re
@ -54,7 +53,6 @@ class NmapDeviceScanner(object):
def __init__(self, config):
self.last_results = []
self.lock = threading.Lock()
self.hosts = config[CONF_HOSTS]
minutes = convert(config.get(CONF_HOME_INTERVAL), int, 0)
self.home_interval = timedelta(minutes=minutes)
@ -116,10 +114,9 @@ class NmapDeviceScanner(object):
if not self.success_init:
return False
with self.lock:
_LOGGER.info("Scanning")
options = "-F"
options = "-F --host-timeout 5"
exclude_targets = set()
if self.home_interval:
now = datetime.now()