Merge branch 'ospd-20.08' into scanner-params

greenbone · Jul 23, 2020 · a509108 · a509108
2 parents 7521f7b + 98d5bb3
commit a509108
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Make scan_id attribute mandatory for get_scans. [#270](https://github.com/greenbone/ospd/pull/270)
 - Ignore subsequent SIGINT once inside exit_cleanup(). [#273](https://github.com/greenbone/ospd/pull/273)
 - Simplify start_scan() [#275](https://github.com/greenbone/ospd/pull/275)
+- Make ospd-openvas to shut down gracefully  [#302](https://github.com/greenbone/ospd/pull/302)
 
 ### Fixed
 - Fix stop scan. Wait for the scan process to be stopped before delete it from the process table. [#204](https://github.com/greenbone/ospd/pull/204)

diff --git a/ospd/main.py b/ospd/main.py
@@ -72,13 +72,12 @@ def exit_cleanup(
     signal.signal(signal.SIGINT, signal.SIG_IGN)
     pidpath = Path(pidfile)
 
-    daemon.daemon_exit_cleanup()
-
     if not pidpath.is_file():
         return
 
     with pidpath.open() as f:
         if int(f.read()) == os.getpid():
+            daemon.daemon_exit_cleanup()
             LOGGER.info("Shutting-down server ...")
             server.close()
             LOGGER.debug("Finishing daemon process")
@@ -144,7 +143,9 @@ def main(
     signal.signal(
         signal.SIGTERM, partial(exit_cleanup, args.pid_file, server, daemon)
     )
-
+    signal.signal(
+        signal.SIGINT, partial(exit_cleanup, args.pid_file, server, daemon)
+    )
     if not daemon.check():
         return 1