More output on errors, make them non-fatal

This commit is contained in:
Isaac Connor committed 2016-06-07 21:37:33 -04:00
1 parent c3043c1487
commit 5ff53ebce0
1 file changed
+9 -3
+9 -3
View File
@@ -197,14 +197,20 @@ MAIN: while( $loop ) {
my $fs_events = $fs_monitors->{$monitor} = {};
# De-taint
( my $monitor_dir ) = ( $monitor =~ /^(.*)$/ );
if ( $Config{ZM_USE_DEEP_STORAGE} ) {
foreach my $day_dir ( glob("$monitor_dir/*/*/*") ) {
Debug( "Checking $day_dir" );
( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
chdir( $day_dir );
opendir( DIR, "." )
or Fatal( "Can't open directory '$day_dir': $!" );
if ( ! chdir( $day_dir ) ) {
Error( "Can't chdir to $$Storage{Path}/$monitor_dir/'$day_dir': $!" );
next;
}
if ( ! opendir( DIR, "." ) ) {
Error( "Can't open directory $$Storage{Path}/$monitor_dir/'$day_dir': $!" );
next;
}
my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
closedir( DIR );
my $count = 0;