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

rename fs_monitor to monitor_id, which is what it is

This commit is contained in:
Isaac Connor 2016-06-06 10:30:52 -04:00
parent 2460bccdac
commit b081d2e3bf
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/zmaudit.pl.in
View File

@ -255,29 +255,29 @@ MAIN: while( $loop ) {
redo MAIN if ( $cleaned );
$cleaned = 0;
while ( my ( $fs_monitor, $fs_events ) = each(%$fs_monitors) ) {
if ( my $db_events = $db_monitors->{$fs_monitor} ) {
while ( my ( $monitor_id, $fs_events ) = each(%$fs_monitors) ) {
if ( my $db_events = $db_monitors->{$monitor_id} ) {
next if ! $fs_events;
foreach my $fs_event ( sort { $a <=> $b } keys %$fs_events ) {
my $age = $fs_events->{$fs_event};
if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > $Config{ZM_AUDIT_MIN_AGE})) ) {
aud_print( "Filesystem event '$fs_monitor/$fs_event' does not exist in database" );
if ( confirm() ) {
my $Event = new ZoneMinder::Event( $fs_event );
# Must set these because the db event does not exist
$Event->MonitorId( $fs_monitor );
$Event->StorageId( $Storage->Id() );
$Event->delete_files();
$cleaned = 1;
delete $fs_events->{$fs_event};
} # end if confirm
} # end if ! in db events and old enough
} # end foreach fs event
foreach my $fs_event ( sort { $a <=> $b } keys %$fs_events ) {
my $age = $fs_events->{$fs_event};
if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > $Config{ZM_AUDIT_MIN_AGE})) ) {
aud_print( "Filesystem event '$$Storage{Path}/$monitor_id/$fs_event' does not exist in database" );
if ( confirm() ) {
my $Event = new ZoneMinder::Event( $fs_event );
# Must set these because the db event does not exist, however these are not enough.
$Event->MonitorId( $monitor_id );
$Event->StorageId( $Storage->Id() );
$Event->delete_files();
$cleaned = 1;
delete $fs_events->{$fs_event};
} # end if confirm
} # end if ! in db events and old enough
} # end foreach fs event
} else {
aud_print( "Filesystem monitor '$fs_monitor' in $$Storage{Path} does not exist in database" );
aud_print( "Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database" );
if ( confirm() ) {
my $command = "rm -rf $fs_monitor";
my $command = "rm -rf $monitor_id";
executeShellCommand( $command );
$cleaned = 1;
}