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

merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect

This commit is contained in:
Isaac Connor 2017-01-10 14:22:42 -05:00
parent 66cdcd95fa
commit a66e9e45a2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/zmtrigger.pl.in
View File

@ -198,6 +198,7 @@ my %spawned_connections;
my %monitors;
my $monitor_reload_time = 0;
my $needsReload = 0;
$! = undef;
my $rin = '';
@ -313,6 +314,19 @@ while( 1 )
my @out_messages;
foreach my $monitor ( values(%monitors) )
{
my $memVerified = 1;
if ( !zmMemRead($monitor, "shared_data:valid") ) {
# Shared data is invalid, attempt to reconnect
zmMemInvalidate($monitor);
$memVerified = zmMemVerify($monitor);
}
if ( ! $memVerified ) {
# Our attempt to verify the memory handle failed. We should reload the monitors.
$needsReload = 1;
next;
}
my ( $state, $last_event )
= zmMemRead( $monitor,
[ "shared_data:state",
@ -413,7 +427,7 @@ while( 1 )
}
# If necessary reload monitors
if ( (time() - $monitor_reload_time) > MONITOR_RELOAD_INTERVAL )
if ( $needsReload || ((time() - $monitor_reload_time) > MONITOR_RELOAD_INTERVAL ))
{
foreach my $monitor ( values(%monitors) )
{
@ -421,6 +435,7 @@ while( 1 )
zmMemInvalidate( $monitor );
}
loadMonitors();
$needsReload = 0;
}
}
Info( "Trigger daemon exiting\n" );