change ErrorHandler to Log
This commit is contained in:
parent
d11cd6f4f7
commit
199c4e4960
90 changed files with 311 additions and 311 deletions
|
|
@ -102,14 +102,14 @@ sub execute {
|
|||
my $instance = shift;
|
||||
|
||||
unless ($self->session->config->get('exportPath')) {
|
||||
$self->session->errorHandler->warn("DeleteExportedFiles: no export path, so not doing anything");
|
||||
$self->session->log->warn("DeleteExportedFiles: no export path, so not doing anything");
|
||||
return $self->COMPLETE;
|
||||
}
|
||||
|
||||
my $time = time;
|
||||
my $filesRef = Storable::thaw($instance->getScratch(DELETE_FILES_SCRATCH));
|
||||
unless ($filesRef) {
|
||||
$self->session->errorHandler->error("DeleteExportedFiles: can't find list of files to delete");
|
||||
$self->session->log->error("DeleteExportedFiles: can't find list of files to delete");
|
||||
return $self->ERROR;
|
||||
}
|
||||
|
||||
|
|
@ -119,14 +119,14 @@ sub execute {
|
|||
my $ttl = $self->getTTL;
|
||||
while (defined(my $filename = shift @files)) {
|
||||
my $cfilename = $self->_canonExportPath($filename);
|
||||
unlink $cfilename or $self->session->errorHandler->warn("DeleteExportedFiles: Couldn't unlink $filename: $!"), next;
|
||||
unlink $cfilename or $self->session->log->warn("DeleteExportedFiles: Couldn't unlink $filename: $!"), next;
|
||||
push @dirs, $self->_pruneOfFile($filename);
|
||||
goto pause if (time - $time > $ttl);
|
||||
}
|
||||
|
||||
while (defined(my $dirname = shift @dirs)) {
|
||||
my $cdirname = $self->_canonExportPath($dirname);
|
||||
rmdir $cdirname or $self->session->errorHandler->warn("DeleteExportedFiles: couldn't rmdir $dirname: $!"), next;
|
||||
rmdir $cdirname or $self->session->log->warn("DeleteExportedFiles: couldn't rmdir $dirname: $!"), next;
|
||||
push @dirs, $self->_pruneOfFile($dirname);
|
||||
goto pause if (time - $time > $ttl);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue