Merge pull request #303 from jjnicola/shut-down-gracefully

Stop all running scans before exiting

CHANGELOG.md

@@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix get_scanner_details(). [#210](https://github.com/greenbone/ospd/pull/210)
 - Fix thread lib leak using daemon mode for python 3.7. [#272](https://github.com/greenbone/ospd/pull/272)
 - Fix scan progress in which all hosts are dead or excluded. [#295](https://github.com/greenbone/ospd/pull/295)
+- Stop all running scans before exiting [#303](https://github.com/greenbone/ospd/pull/303)
 - Fix start of parallel queued task. [#304](https://github.com/greenbone/ospd/pull/304)
 
 ### Removed

ospd/main.py

@@ -77,6 +77,7 @@ def exit_cleanup(
 
     with pidpath.open() as f:
         if int(f.read()) == os.getpid():
+            LOGGER.debug("Performing exit clean up")
             daemon.daemon_exit_cleanup()
             LOGGER.info("Shutting-down server ...")
             server.close()

ospd/ospd.py

@@ -440,6 +440,25 @@ def daemon_exit_cleanup(self) -> None:
         """ Perform a cleanup before exiting """
         self.scan_collection.clean_up_pickled_scan_info()
 
+        for scan_id in self.scan_collection.ids_iterator():
+            self.stop_scan(scan_id)
+
+        while True:
+            all_stopped = True
+            for scan_id in self.scan_collection.ids_iterator():
+                status = self.get_scan_status(scan_id)
+                if (
+                    status != ScanStatus.STOPPED
+                    or status != ScanStatus.FINISHED
+                    or status != ScanStatus.INTERRUPTED
+                ):
+                    all_stopped = False
+
+            if all_stopped:
+                return
+
+            time.sleep(1)
+
     def get_daemon_name(self) -> str:
         """ Gives osp daemon's name. """
         return self.daemon_info['name']