CHANGE: Use full path GSAD_PID_PATH for PID files

The calls of pidfile_create and pidfile_remove are adjusted to use a full path defined by GSAD_PID_PATH.
greenbone · Nov 15, 2021 · 14bf449 · 14bf449
1 parent fd875a0
commit 14bf449
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,6 +89,10 @@ if (NOT GVM_RUN_DIR)
   set (GVM_RUN_DIR  "/run/gvm")
 endif (NOT GVM_RUN_DIR)
 
+if (NOT GSAD_PID_PATH)
+  set (GSAD_PID_PATH     "/run/gsad/gsad.pid")
+endif (NOT GSAD_PID_PATH)
+
 if (NOT GSAD_PID_DIR)
   set (GSAD_PID_DIR "${GVM_RUN_DIR}")
 endif (NOT GSAD_PID_DIR)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -129,6 +129,10 @@ if (GVM_RUN_DIR)
   add_definitions (-DGVM_RUN_DIR="${GVM_RUN_DIR}")
 endif (GVM_RUN_DIR)
 
+if (GSAD_PID_PATH)
+        add_definitions (-DGSAD_PID_PATH="${GSAD_PID_PATH}")
+endif (GSAD_PID_PATH)
+
 if (GSAD_DATA_DIR)
   add_definitions (-DGSAD_DATA_DIR="${GSAD_DATA_DIR}")
 endif (GSAD_DATA_DIR)

diff --git a/src/gsad.c b/src/gsad.c
@@ -2483,7 +2483,7 @@ gsad_cleanup ()
 
   gsad_base_cleanup ();
 
-  pidfile_remove ("gsad");
+  pidfile_remove (GSAD_PID_PATH);
 }
 
 /**
@@ -3155,7 +3155,7 @@ main (int argc, char **argv)
 
   /* Write pidfile. */
 
-  if (pidfile_create ("gsad"))
+  if (pidfile_create (GSAD_PID_PATH))
     {
       g_critical ("%s: Could not write PID file.\n", __func__);
       exit (EXIT_FAILURE);