From ad6df1fae671d618f65125bf167ee74576956735 Mon Sep 17 00:00:00 2001
From: Christian Ramseyer <ramseyer@netnea.com>
Date: Wed, 24 Nov 2021 14:11:56 +0100
Subject: [PATCH] Bugfix: after rotate_logs, restarter() may have a stale PID
 (#840)

* when rotate_logs restarts the process due to the file being
  above the size limit, the new PID is not returned to the
  caller

* this leads to signal_child signaling the old, non-existing PID
  and subsequently a second master process being started

* fixed by returning the PID from rotate_logs
---
 bin/netdisco-backend | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/netdisco-backend b/bin/netdisco-backend
index a5990da5..cea2b5b1 100755
--- a/bin/netdisco-backend
+++ b/bin/netdisco-backend
@@ -96,7 +96,6 @@ my $child = 0;
 sub restarter {
   my ($daemon, @program_args) = @_;
   $0 = 'netdisco-backend';
-
   $child = fork_and_start($daemon, @program_args);
   exit(1) unless $child;
 
@@ -129,8 +128,7 @@ sub restarter {
               ++$hupit;
           }
       }
-
-      rotate_logs($child, $daemon, @program_args) if $rotate;
+      $child = rotate_logs($child, $daemon, @program_args) if $rotate;
       if ($hupit) {
           signal_child('TERM', $child);
           $child = fork_and_start($daemon, @program_args);
@@ -163,8 +161,7 @@ sub signal_child {
 
 sub rotate_logs {
   my $child = shift;
-
-  return unless (-f $log_file) and
+  return $child unless (-f $log_file) and
     ((-s $log_file) > ($logsize * 1024768));
 
   my @files = grep { /$log_file\.\d+/ } glob file($log_dir, '*');
@@ -184,11 +181,15 @@ sub rotate_logs {
       rename $log_file, $log_file .'.1';
       signal_child('TERM', $child);
       $child = fork_and_start(@_);
-      exit(1) unless $child;
-  }
-  else {
+      if ($child){
+        return $child;
+      }else{
+        exit(1);
+      }
+  } else {
       copy $log_file, $log_file .'.1';
       truncate $log_file, 0;
+      return $child;
   }
 }