ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip row locking in UpdateDiskSpace if the filter is already locking rows

pull/3090/head
Isaac Connor 2020-12-03 14:26:51 -05:00
parent cfd4c17953
commit 6e64114ac3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/zmfilter.pl.in
View File

@ -381,8 +381,10 @@ sub checkFilter {
} # end if AutoCopy } # end if AutoCopy
if ( $filter->{UpdateDiskSpace} ) { if ( $filter->{UpdateDiskSpace} ) {
$ZoneMinder::Database::dbh->begin_work(); if ( $$filter{LockRows} ) {
$Event->lock_and_load(); $ZoneMinder::Database::dbh->begin_work();
$Event->lock_and_load();
}
my $old_diskspace = $$Event{DiskSpace}; my $old_diskspace = $$Event{DiskSpace};
my $new_diskspace = $Event->DiskSpace(undef); my $new_diskspace = $Event->DiskSpace(undef);
@ -394,7 +396,7 @@ sub checkFilter {
) { ) {
$Event->save(); $Event->save();
} }
$ZoneMinder::Database::dbh->commit(); $ZoneMinder::Database::dbh->commit() if !$$filter{LockRows};
} # end if UpdateDiskSpace } # end if UpdateDiskSpace
} # end foreach event } # end foreach event
ZoneMinder::Database::end_transaction($dbh, $in_transaction) if $$filter{LockRows}; ZoneMinder::Database::end_transaction($dbh, $in_transaction) if $$filter{LockRows};