From ffdb0f98249819c5a75c123da4709e995deeee80 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 23 Nov 2021 11:05:39 -0500
Subject: [PATCH] If we are starting a process that is waiting to term, mark it
 to get started by the reaper.  Fixes case where zmdc thought the process was
 still running and so didn't start it.  We never noticed because zmwatch would
 eventually notice.  The result is instant restart.

---
 scripts/zmdc.pl.in | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 5cf866e56..793049479 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -429,10 +429,20 @@ sub start {
 # It's not running, or at least it's not been started by us
     $process = { daemon=>$daemon, args=>\@args, command=>$command, keepalive=>!undef };
   } elsif ( $process->{pid} && $pid_hash{$process->{pid}} ) {
-    dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' already running at "
+    if ($process->{term_sent_at}) {
+      dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' was told to term at "
+        .strftime('%y/%m/%d %H:%M:%S', localtime($process->{term_sent_at}))
+        .", pid = $process->{pid}\n"
+      );
+      $process->{keepalive} = !undef;
+      $process->{delay} = 0;
+      delete $terminating_processes{$command};
+    } else {
+      dPrint(ZoneMinder::Logger::INFO, "'$process->{command}' already running at "
         .strftime('%y/%m/%d %H:%M:%S', localtime($process->{started}))
         .", pid = $process->{pid}\n"
-        );
+      );
+    }
     return;
   }
 
@@ -523,7 +533,7 @@ sub send_stop {
         ."\n"
         );
     sigprocmask(SIG_UNBLOCK, $blockset) or die "dying at unblock...\n";
-    return();
+    return ();
   }
 
   my $pid = $process->{pid};
@@ -586,7 +596,7 @@ sub check_for_processes_to_kill {
 
 sub stop {
   my ( $daemon, @args ) = @_;
-  my $command = join(' ', $daemon, @args );
+  my $command = join(' ', $daemon, @args);
   my $process = $cmd_hash{$command};
   if ( !$process ) {
     dPrint(ZoneMinder::Logger::WARNING, "Can't find process with command of '$command'");