better error handling

This commit is contained in:
Evgeny Zinoviev 2021-06-06 01:15:07 +03:00
parent 48b851d7ad
commit 4314ab72e3
2 changed files with 12 additions and 5 deletions

View File

@ -22,6 +22,7 @@ class TCPScanner:
self.timeout = timeout self.timeout = timeout
self.results = [] self.results = []
self.q = queue.SimpleQueue() self.q = queue.SimpleQueue()
self.failed = False
def scan(self, num_threads=5): def scan(self, num_threads=5):
for port in self.ports: for port in self.ports:
@ -36,12 +37,18 @@ class TCPScanner:
for t in threads: for t in threads:
t.join() t.join()
return self.results
def run(self): def run(self):
try: try:
while True: while True:
self._scan(self.q.get(block=False)) if self.failed:
break
try:
self._scan(self.q.get(block=False))
except Exception as e:
logger.exception(e)
self.failed = True
break
except queue.Empty: except queue.Empty:
return return

View File

@ -84,7 +84,7 @@ class Worker(Thread):
def run(self): def run(self):
logger.info(f'starting {self.name} ({self.concurrency} threads)') logger.info(f'starting {self.name} ({self.concurrency} threads)')
self.scanner.scan(num_threads=self.concurrency) self.scanner.scan(num_threads=self.concurrency)
self.done = True self.done = not self.scanner.failed
logger.info(f'finished {self.name}') logger.info(f'finished {self.name}')
def get_results(self): def get_results(self):