From 4218368936ee0e3613d29903a333f334b65f63dd Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 6 Jun 2003 10:36:23 +0000 Subject: Regularily clean up temp dir --- Echolot/Config.pm | 3 ++- Echolot/Pinger/CPunk.pm | 10 +++++----- Echolot/Tools.pm | 16 +++++++++++++++- 3 files changed, 22 insertions(+), 7 deletions(-) (limited to 'Echolot') diff --git a/Echolot/Config.pm b/Echolot/Config.pm index 6b1be41..8bd4e0f 100644 --- a/Echolot/Config.pm +++ b/Echolot/Config.pm @@ -1,7 +1,7 @@ package Echolot::Config; # (c) 2002 Peter Palfrader -# $Id: Config.pm,v 1.62 2003/02/28 18:02:31 weasel Exp $ +# $Id: Config.pm,v 1.63 2003/06/06 10:36:23 weasel Exp $ # =pod @@ -124,6 +124,7 @@ sub init($) { expire_thesaurus => 21*24*60*60, # 21 days expire_chainpings => 12*24*60*60, # 12 days expire_fromlines => 5*24*60*60, # 5 days + cleanup_tmpdir => 24*60*60, # daily random_garbage => 8192, diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm index 9379ee4..08bed0c 100644 --- a/Echolot/Pinger/CPunk.pm +++ b/Echolot/Pinger/CPunk.pm @@ -1,7 +1,7 @@ package Echolot::Pinger::CPunk; # (c) 2002 Peter Palfrader -# $Id: CPunk.pm,v 1.19 2003/02/22 19:08:55 weasel Exp $ +# $Id: CPunk.pm,v 1.20 2003/06/06 10:36:23 weasel Exp $ # =pod @@ -150,8 +150,8 @@ sub encrypt_to($$$$) { unlink ($keyring.'~'); # gnupg does those evil backups (defined $plaintextfile) and - ( unlink ($plaintextfile) or - Echolot::Log::warn("Cannot unlink tmp keyring '$plaintextfile'."), + (unlink ($plaintextfile) or + Echolot::Log::warn("Cannot unlink tmp plaintextfile '$plaintextfile'."), return undef); @@ -167,8 +167,8 @@ sub encrypt_to($$$$) { return 0; (defined $plaintextfile) and - ( unlink ($plaintextfile) or - Echolot::Log::warn("Cannot unlink tmp keyring '$plaintextfile'."), + (unlink ($plaintextfile) or + Echolot::Log::warn("Cannot unlink tmp plaintextfile '$plaintextfile'."), return undef); $result =~ s,^Version: .*$,Version: N/A,m; diff --git a/Echolot/Tools.pm b/Echolot/Tools.pm index fd86a4c..c3ad305 100644 --- a/Echolot/Tools.pm +++ b/Echolot/Tools.pm @@ -1,7 +1,7 @@ package Echolot::Tools; # (c) 2002 Peter Palfrader -# $Id: Tools.pm,v 1.22 2003/06/06 09:32:37 weasel Exp $ +# $Id: Tools.pm,v 1.23 2003/06/06 10:36:23 weasel Exp $ # =pod @@ -363,6 +363,20 @@ sub read_file($;$) { return $result; }; +sub cleanup_tmp() { + my $tmpdir = Echolot::Config::get()->{'tmpdir'}; + + opendir(DIR, $tmpdir) or + Echolot::Log::warn("Could not open '$tmpdir': $!."), + return undef; + my @files = grep { ! /^[.]/ } readdir(DIR); + closedir(DIR); + + for my $file (@files) { + unlink($tmpdir.'/'.$file) or + Echolot::Log::warn("Could not unlink '$tmpdir/$file': $!."); + }; +}; 1; -- cgit v1.2.3