You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2008/01/15 00:23:45 UTC
svn commit: r611969 -
/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
Author: jm
Date: Mon Jan 14 15:23:42 2008
New Revision: 611969
URL: http://svn.apache.org/viewvc?rev=611969&view=rev
Log:
more experiments with the DB_File hang handling
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm?rev=611969&r1=611968&r2=611969&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm Mon Jan 14 15:23:42 2008
@@ -83,7 +83,8 @@
# bug 5731: something in DB_File appears to hang on tie() on gutsy
my $err;
my $tied;
- my $timer = Mail::SpamAssassin::Timeout->new({ secs => 60 });
+ dbg("starting tie timeout at ".(scalar localtime time));
+ my $timer = Mail::SpamAssassin::Timeout->new({ secs => 30 });
$timer->run_and_catch(sub {
($self->{is_locked} && $dbm_module eq 'DB_File') and
@@ -93,11 +94,13 @@
oct($main->{conf}->{auto_whitelist_file_mode});
$err = $!;
+ dbg("tie returned: ".(scalar localtime time));
});
+ dbg("timer returned: ".(scalar localtime time));
if ($timer->timed_out() || !$tied) {
if ($timer->timed_out()) {
- warn "auto-whitelist: DB_File tie() call timed out after 60 seconds";
+ warn "auto-whitelist: DB_File tie() call timed out after 30 seconds";
$err = "timed out";
}