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

move the reconnect to db logic after the continuous sleep, so that we reconnect after long sleep

This commit is contained in:
Isaac Connor 2017-04-19 12:46:44 -04:00
parent d2fb4a7874
commit c80c02ea00
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/zmaudit.pl.in
View File

@ -128,6 +128,20 @@ my $loop = 1;
my $cleaned = 0;
MAIN: while( $loop ) {
if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
Fatal("ZM_AUDIT_MIN_AGE is not set in config.");
}
if ( $continuous ) {
# if we are running continuously, then just skip to the next
# interval, otherwise we are a one off run, so wait a second and
# retry until someone kills us.
sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
} else {
sleep 1;
} # end if
# After a long sleep, we may need to reconnect to the db
while ( ! ( $dbh and $dbh->ping() ) ) {
$dbh = zmDbConnect();
@ -142,19 +156,6 @@ MAIN: while( $loop ) {
} # end if
} # end while can't connect to the db
if ( $continuous ) {
# if we are running continuously, then just skip to the next
# interval, otherwise we are a one off run, so wait a second and
# retry until someone kills us.
sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
} else {
sleep 1;
} # end if
if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
Fatal("ZM_AUDIT_MIN_AGE is not set in config.");
}
my %Monitors;
my $db_monitors;
my $monitorSelectSql = $monitor_id ? 'SELECT * FRO Monitors WHERE Id=?' : 'SELECT * FROM Monitors ORDER BY Id';
@ -168,7 +169,7 @@ MAIN: while( $loop ) {
$cleaned = 0;
my $res = $monitorSelectSth->execute( $monitor_id ? $monitor_id : () )
or Fatal( "Can't execute: ".$monitorSelectSth->errstr() );
or Fatal( "Can't execute: $monitorSelectSql ".$monitorSelectSth->errstr() );
while( my $monitor = $monitorSelectSth->fetchrow_hashref() ) {
$Monitors{$$monitor{Id}} = $monitor;