This commit is contained in:
Isaac Connor 2021-08-30 13:32:43 -04:00
parent 6b481fa2b5
commit 1a0d488457
1 changed files with 18 additions and 19 deletions

View File

@ -147,9 +147,9 @@ while (!$zm_terminate) {
if ($restart) { if ($restart) {
my $command; my $command;
if ($monitor->{Type} eq 'Local') { if ($monitor->{Type} eq 'Local') {
$command = "zmdc.pl restart zmc -d $monitor->{Device}"; $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
} else { } else {
$command = "zmdc.pl restart zmc -m $monitor->{Id}"; $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
} }
runCommand($command); runCommand($command);
} elsif ($monitor->{Function} ne 'Monitor') { } elsif ($monitor->{Function} ne 'Monitor') {
@ -166,7 +166,6 @@ while (!$zm_terminate) {
#$restart = 1; #$restart = 1;
Error("Last analyse time for $$monitor{Id} $$monitor{Name} was zero."); Error("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
} else { } else {
my $max_image_delay = ( $monitor->{MaxFPS} my $max_image_delay = ( $monitor->{MaxFPS}
&&($monitor->{MaxFPS}>0) &&($monitor->{MaxFPS}>0)
&&($monitor->{MaxFPS}<1) &&($monitor->{MaxFPS}<1)
@ -184,12 +183,12 @@ while (!$zm_terminate) {
} }
if ($restart) { if ($restart) {
Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}\n"); Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}");
my $command; my $command;
if ( $monitor->{Type} eq 'Local' ) { if ( $monitor->{Type} eq 'Local' ) {
$command = "zmdc.pl restart zmc -d $monitor->{Device}"; $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
} else { } else {
$command = "zmdc.pl restart zmc -m $monitor->{Id}"; $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
} }
runCommand($command); runCommand($command);
} # end if restart } # end if restart
@ -201,7 +200,7 @@ while (!$zm_terminate) {
sleep($Config{ZM_WATCH_CHECK_INTERVAL}); sleep($Config{ZM_WATCH_CHECK_INTERVAL});
} # end while (!$zm_terminate) } # end while (!$zm_terminate)
Info("Watchdog exiting"); Info('Watchdog exiting');
exit(); exit();
1; 1;