X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=b3c0dbfac04e2abb9e406e4599918b447390b033;hb=51904800e252cf4c286f1cb740ae58abdb56cb9a;hp=4443fc5570ac2360d40af67587c5d10f028aeec4;hpb=a204e3cd89e849e97db25879b4ddf62b770bd227;p=spider.git diff --git a/perl/Filter.pm b/perl/Filter.pm index 4443fc55..b3c0dbfa 100644 --- a/perl/Filter.pm +++ b/perl/Filter.pm @@ -116,17 +116,26 @@ sub read_in $in = undef; my $s = readfilestr($fn); my $newin = eval $s; - dbg($@) if $@; + if ($@) { + dbg($@); + unlink($fn); + return undef; + } if ($in) { $newin = new('Filter::Old', $sort, $call, $flag); $newin->{filter} = $in; - } else { + } elsif (ref $newin && $newin->can('getfilkeys')) { my $filter; my $key; foreach $key ($newin->getfilkeys) { $newin->compile($key, 'reject'); $newin->compile($key, 'accept'); } + } else { + # error on reading file, delete and exit + dbg("empty or unreadable filter: $fn, deleted"); + unlink($fn); + return undef; } return $newin; } @@ -307,7 +316,7 @@ sub install } elsif ($name eq 'USER_DEFAULT') { @dxchan = DXChannel::get_all_users(); } else { - $dxchan = DXChannel->get($name); + $dxchan = DXChannel::get($name); push @dxchan, $dxchan if $dxchan; } foreach $dxchan (@dxchan) {