Merge pull request #432 from Kraemii/improve-structure

Improve structure

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Set Log Timestamp to UTC. [#394](https://github.com/greenbone/ospd-openvas/pull/394)
+- Stopping scan. [#432](https://github.com/greenbone/ospd/pull/432)
 
 ### Fixed
 ### Removed

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,