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

Fix use of next when it should be return. Improve some logging of errors.

This commit is contained in:
Isaac Connor 2020-11-11 17:40:31 -05:00
parent 076d649189
commit 7b764d04d3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/zmtrigger.pl.in
View File

@ -372,9 +372,10 @@ sub handleMessage {
Warning("Can't find monitor '$id' for message '$message'"); Warning("Can't find monitor '$id' for message '$message'");
return; return;
} }
Debug("Found monitor for id '$id'"); if ( !zmMemVerify($monitor) ) {
Warning("Can't verify monitor '$id' for message '$message'");
next if !zmMemVerify($monitor); return;
}
Debug("Handling action '$action'"); Debug("Handling action '$action'");
if ( $action =~ /^(enable|disable)(?:[\+ ](\d+))?$/ ) { if ( $action =~ /^(enable|disable)(?:[\+ ](\d+))?$/ ) {
@ -393,12 +394,19 @@ sub handleMessage {
handleDelay($delay, $connection, $action_text); handleDelay($delay, $connection, $action_text);
} }
} elsif ( $action =~ /^(on|off)(?:[ \+](\d+))?$/ ) { } elsif ( $action =~ /^(on|off)(?:[ \+](\d+))?$/ ) {
next if !$monitor->{Enabled}; if ( !$monitor->{Enabled} ) {
Info('Motion detection not enabled on monitor '.$id);
return;
}
my $trigger = $1; my $trigger = $1;
my $delay = $2; my $delay = $2;
my $trigger_data; my $trigger_data;
if ( $trigger eq 'on' ) { if ( $trigger eq 'on' ) {
if ( $score <= 0 ) {
Warning('Triggering on with invalid score will have no result.');
return;
}
zmTriggerEventOn($monitor, $score, $cause, $text); zmTriggerEventOn($monitor, $score, $cause, $text);
zmTriggerShowtext($monitor, $showtext) if defined($showtext); zmTriggerShowtext($monitor, $showtext) if defined($showtext);
Info("Trigger '$trigger' '$cause'"); Info("Trigger '$trigger' '$cause'");