ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverse the if statement to reduce indenting

This commit is contained in:
Isaac Connor 2015-06-19 08:59:49 -04:00
parent 5dd1c6cf38
commit a9175705c1
1 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
scripts/zmwatch.pl.in
View File

@ -85,15 +85,60 @@ while( 1 )
or Fatal( "Can't execute: ".$sth->errstr() ); or Fatal( "Can't execute: ".$sth->errstr() );
while( my $monitor = $sth->fetchrow_hashref() ) while( my $monitor = $sth->fetchrow_hashref() )
{ {
if ( $monitor->{Function} ne 'None' ) next if $monitor->{Function} eq 'None';
my $restart = 0;
if ( zmMemVerify( $monitor )
&& zmMemRead( $monitor, "shared_data:valid" )
)
{
# Check we have got an image recently
my $image_time = zmGetLastWriteTime( $monitor );
next if ( !defined($image_time) ); # Can't read from shared data
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
my $max_image_delay = ( $monitor->{MaxFPS}
&&($monitor->{MaxFPS}>0)
&&($monitor->{MaxFPS}<1)
) ? (3/$monitor->{MaxFPS})
: $Config{ZM_WATCH_MAX_DELAY}
;
my $image_delay = $now-$image_time;
Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
if ( $image_delay > $max_image_delay )
{
Info( "Restarting capture daemon for "
.$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n"
);
$restart = 1;
}
}
else
{
#Info( "Restarting capture daemon for ".$monitor->{Name}.", shared data not valid\n" );
#$restart = 1;
}
if ( $restart )
{
my $command;
if ( $monitor->{Type} eq 'Local' )
{
$command = "zmdc.pl restart zmc -d $monitor->{Device}";
}
else
{
$command = "zmdc.pl restart zmc -m $monitor->{Id}";
}
runCommand( $command );
}
elsif ( $monitor->{Function} ne 'Monitor' )
{ {
my $restart = 0;
if ( zmMemVerify( $monitor ) if ( zmMemVerify( $monitor )
&& zmMemRead( $monitor, "shared_data:valid" ) && zmMemRead( $monitor, "shared_data:valid" )
) )
{ {
# Check we have got an image recently # Check we have got an image recently
my $image_time = zmGetLastWriteTime( $monitor ); my $image_time = zmGetLastReadTime( $monitor );
next if ( !defined($image_time) ); # Can't read from shared data next if ( !defined($image_time) ); # Can't read from shared data
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died. next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
@ -104,67 +149,20 @@ while( 1 )
: $Config{ZM_WATCH_MAX_DELAY} : $Config{ZM_WATCH_MAX_DELAY}
; ;
my $image_delay = $now-$image_time; my $image_delay = $now-$image_time;
Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" ); Debug( "Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay\n" );
if ( $image_delay > $max_image_delay ) if ( $image_delay > $max_image_delay )
{ {
Info( "Restarting capture daemon for " Info( "Restarting analysis daemon for "
.$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" .$monitor->{Name}.", time since last analysis $image_delay seconds ($now-$image_time)\n"
); );
$restart = 1; my $command = "zmdc.pl restart zma -m ".$monitor->{Id};
} runCommand( $command );
}
else
{
#Info( "Restarting capture daemon for ".$monitor->{Name}.", shared data not valid\n" );
#$restart = 1;
}
if ( $restart )
{
my $command;
if ( $monitor->{Type} eq 'Local' )
{
$command = "zmdc.pl restart zmc -d $monitor->{Device}";
}
else
{
$command = "zmdc.pl restart zmc -m $monitor->{Id}";
}
runCommand( $command );
}
elsif ( $monitor->{Function} ne 'Monitor' )
{
if ( zmMemVerify( $monitor )
&& zmMemRead( $monitor, "shared_data:valid" )
)
{
# Check we have got an image recently
my $image_time = zmGetLastReadTime( $monitor );
next if ( !defined($image_time) ); # Can't read from shared data
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
my $max_image_delay = ( $monitor->{MaxFPS}
&&($monitor->{MaxFPS}>0)
&&($monitor->{MaxFPS}<1)
) ? (3/$monitor->{MaxFPS})
: $Config{ZM_WATCH_MAX_DELAY}
;
my $image_delay = $now-$image_time;
Debug( "Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay\n" );
if ( $image_delay > $max_image_delay )
{
Info( "Restarting analysis daemon for "
.$monitor->{Name}.", time since last analysis $image_delay seconds ($now-$image_time)\n"
);
my $command = "zmdc.pl restart zma -m ".$monitor->{Id};
runCommand( $command );
}
} }
} }
} }
# Prevent open handles building up if we have connect to shared memory
zmMemInvalidate( $monitor );
} }
# Prevent open handles building up if we have connect to shared memory
zmMemInvalidate( $monitor );
sleep( $Config{ZM_WATCH_CHECK_INTERVAL} ); sleep( $Config{ZM_WATCH_CHECK_INTERVAL} );
} }
Info( "Watchdog exiting\n" ); Info( "Watchdog exiting\n" );