From e15227d53e73017ca81d09da8390619a994ea600 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 26 Dec 2018 18:18:22 -0500 Subject: [PATCH] remove zma restarts --- scripts/zmwatch.pl.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in index c7cd73d95..2c2da9245 100644 --- a/scripts/zmwatch.pl.in +++ b/scripts/zmwatch.pl.in @@ -123,7 +123,7 @@ while( 1 ) { ) ? (3/$monitor->{MaxFPS}) : $Config{ZM_WATCH_MAX_DELAY} ; - my $image_delay = $now-$capture_time; + my $image_delay = $now - $capture_time; Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay"); if ( $image_delay > $max_image_delay ) { Info("Restarting capture daemon for " @@ -138,9 +138,6 @@ while( 1 ) { } if ( $restart ) { - # Because zma depends on zmc, and zma can hold the shm in place, preventing zmc from using the space in /dev/shm, - # we need to stop zma before restarting zmc. - runCommand("zmdc.pl stop zma -m $$monitor{Id}") if $monitor->{Function} ne 'Monitor'; my $command; if ( $monitor->{Type} eq 'Local' ) { $command = "zmdc.pl restart zmc -d $monitor->{Device}"; @@ -148,7 +145,6 @@ while( 1 ) { $command = "zmdc.pl restart zmc -m $monitor->{Id}"; } runCommand($command); - runCommand("zmdc.pl start zma -m $$monitor{Id}") if $monitor->{Function} ne 'Monitor'; } elsif ( $monitor->{Function} ne 'Monitor' ) { # Now check analysis daemon $restart = 0;