From fbcc01e89c49f5adea58035dffa351bf88bef466 Mon Sep 17 00:00:00 2001 From: Christoph Kraemer Date: Mon, 28 Jun 2021 11:12:31 +0200 Subject: [PATCH] changed stopping scan process --- ospd/ospd.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/ospd/ospd.py b/ospd/ospd.py index be1f1857..49e03db2 100644 --- a/ospd/ospd.py +++ b/ospd/ospd.py @@ -357,8 +357,6 @@ def stop_scan(self, scan_id: str) -> None: '%s: Stopping Scan with the PID %s.', scan_id, scan_process.ident ) - self.stop_scan_cleanup(scan_id) - try: scan_process.terminate() except AttributeError: @@ -381,16 +379,6 @@ def stop_scan(self, scan_id: str) -> None: logger.info('%s: Scan stopped.', scan_id) - @staticmethod - def stop_scan_cleanup(scan_id: str): - """Should be implemented by subclass in case of a clean up before - terminating is needed.""" - - @staticmethod - def target_is_finished(scan_id: str): - """Should be implemented by subclass in case of a check before - stopping is needed.""" - def exec_scan(self, scan_id: str): """Asserts to False. Should be implemented by subclass.""" raise NotImplementedError @@ -558,7 +546,7 @@ def start_scan(self, scan_id: str) -> None: self.finish_scan(scan_id) elif not is_stopped: logger.info( - "%s: Host scan finished. Progress: %d, Status: %s", + "%s: Host scan got interrupted. Progress: %d, Status: %s", scan_id, progress, status.name,