Skip to content

Commit

Permalink
changed stopping scan process
Browse files Browse the repository at this point in the history
  • Loading branch information
Kraemii committed Jul 1, 2021
1 parent 08abab9 commit fbcc01e
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions ospd/ospd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit fbcc01e

Please sign in to comment.