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

revert size check for now

This commit is contained in:
Isaac Connor 2014-08-04 11:26:33 -04:00
parent 56b4d8b230
commit 7cbb079370
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
View File

@ -83,9 +83,17 @@ sub zmMemAttach( $$ )
} }
if ( !defined($monitor->{MMapAddr}) ) if ( !defined($monitor->{MMapAddr}) )
{ {
my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id}; my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
if ( -s $mmap_file != $size ) { if ( ! -e $mmap_file ) {
Error( sprintf( "Memory map file '%s' should have been %d but was instead %d", $mmap_file, $size, -s $mmap_file ) ); Error( sprintf( "Memory map file '%s' does not exist. zmc might not be running.", $mmap_file ) );
return ( undef );
}
my $mmap_file_size = -s $mmap_file;
if ( $mmap_file_size < $size ) {
Error( sprintf( "Memory map file '%s' should have been %d but was instead %d", $mmap_file, $size, $mmap_file_size ) );
return ( undef ); return ( undef );
} }
if ( !open( MMAP, "+<".$mmap_file ) ) if ( !open( MMAP, "+<".$mmap_file ) )