daemons: lib: pidfile of forked daemon is written

bareos · Oct 4, 2021 · 9c638e7 · 9c638e7
1 parent c61d795
commit 9c638e7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/src/dird/dird.cc b/core/src/dird/dird.cc
@@ -361,7 +361,7 @@ int main(int argc, char* argv[])
     if (background) {
       pid_t forkpid = daemon_start();
       if (forkpid) {
-        if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path); }
+        if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path, forkpid); }
 #if !defined(HAVE_WIN32)
         exit(0);
 #endif

diff --git a/core/src/filed/filed.cc b/core/src/filed/filed.cc
@@ -208,7 +208,7 @@ int main(int argc, char* argv[])
   }
 
   int pidfile_fd = 0;
-  if (!foreground && !test_config) {
+  if (!foreground && !test_config && pidfile_path) {
     pidfile_fd = CreatePidFile("bareos-fd", pidfile_path);
   }
 
@@ -248,7 +248,7 @@ int main(int argc, char* argv[])
   if (!foreground && !test_config) {
     pid_t forkpid = daemon_start();
     if (forkpid) {
-      if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path); }
+      if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path, forkpid); }
 #if !defined(HAVE_WIN32)
       exit(0);
 #endif

diff --git a/core/src/lib/bsys.cc b/core/src/lib/bsys.cc
@@ -482,7 +482,7 @@ int CreatePidFile(const char* progName, const char* pidFile)
   return fd;
 }
 
-int WritePidFile(int pidfile_fd, const char* pidFile)
+int WritePidFile(int pidfile_fd, const char* pidFile, pid_t fork_pid)
 {
   char buf[BUF_SIZE];
   if (ftruncate(pidfile_fd, 0) == -1) {
@@ -491,7 +491,7 @@ int WritePidFile(int pidfile_fd, const char* pidFile)
           pidFile, be.bstrerror());
   }
 
-  snprintf(buf, BUF_SIZE, "%ld\n", (long)getpid());
+  snprintf(buf, BUF_SIZE, "%d\n", fork_pid);
   if (write(pidfile_fd, buf, strlen(buf)) != strlen(buf)) {
     BErrNo be;
     Emsg2(M_FATAL, 0, _("Writing to PID file '%s'. ERR=%s\n"), pidFile,

diff --git a/core/src/lib/bsys.h b/core/src/lib/bsys.h
@@ -35,7 +35,7 @@ int Bsnprintf(char* str, int32_t size, const char* format, ...);
 int Bvsnprintf(char* str, int32_t size, const char* format, va_list ap);
 int PoolSprintf(char* pool_buf, const char* fmt, ...);
 int CreatePidFile(const char* progName, const char* pidFile);
-int WritePidFile(int pidfile_fd, const char* pidFile);
+int WritePidFile(int pidfile_fd, const char* pidFile, pid_t fork_pid);
 int DeletePidFile(char* pidfile_path);
 void drop(char* uid, char* gid, bool keep_readall_caps);
 int Bmicrosleep(int32_t sec, int32_t usec);

diff --git a/core/src/stored/stored.cc b/core/src/stored/stored.cc
@@ -239,7 +239,7 @@ int main(int argc, char* argv[])
   if (argc) { usage(); }
 
   int pidfile_fd = 0;
-  if (!foreground && !test_config) {
+  if (!foreground && !test_config && pidfile_path) {
     pidfile_fd = CreatePidFile("bareos-sd", pidfile_path);
   }
 
@@ -278,7 +278,7 @@ int main(int argc, char* argv[])
   if (!foreground && !test_config) {
     pid_t forkpid = daemon_start();
     if (forkpid) {
-      if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path); }
+      if (pidfile_path) { WritePidFile(pidfile_fd, pidfile_path, forkpid); }
 #if !defined(HAVE_WIN32)
       exit(0);
 #endif