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

If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap

This commit is contained in:
Isaac Connor 2021-06-14 13:30:37 -04:00
parent da208457b8
commit d221d6ab3b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
View File

@ -286,8 +286,12 @@ sub suspendMotionDetection {
usleep(100000); usleep(100000);
$count -= 1; $count -= 1;
} }
ZoneMinder::Logger::Error('Unable to suspend motion detection after 5 seconds.') if !$count; if (!$count) {
ZoneMinder::Logger::Debug(1, ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1)); ZoneMinder::Logger::Error('Unable to suspend motion detection after 5 seconds.');
ZoneMinder::Memory::zmMemInvalidate($self); # Close our file handle to the zmc process we are about to end
} else {
ZoneMinder::Logger::Debug(1, 'shared_data:active='.ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1));
}
} }
sub resumeMotionDetection { sub resumeMotionDetection {
@ -297,8 +301,13 @@ sub resumeMotionDetection {
while ($count and !ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1)) { while ($count and !ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1)) {
ZoneMinder::Logger::Debug(1, 'Resuming motion detection'); ZoneMinder::Logger::Debug(1, 'Resuming motion detection');
ZoneMinder::Memory::zmMonitorResume($self); ZoneMinder::Memory::zmMonitorResume($self);
usleep(100000);
$count -= 1;
}
if (!$count) {
ZoneMinder::Logger::Error('Unable to resume motion detection after 5 seconds.');
ZoneMinder::Memory::zmMemInvalidate($self); # Close our file handle to the zmc process we are about to end
} }
ZoneMinder::Logger::Error('Unable to suspend motion detection after 5 seconds.') if !$count;
return 1; return 1;
} }