svn commit: r233111 - /spamassassin/trunk/spamassassin.raw

[jm...@apache.org]

Author: jm
Date: Tue Aug 16 20:09:43 2005
New Revision: 233111

URL: http://svn.apache.org/viewcvs?rev=233111&view=rev
Log:
bug 4536: avoid breakage when warns happen before Mail::SA::Logger is loaded

Modified:
    spamassassin/trunk/spamassassin.raw

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?rev=233111&r1=233110&r2=233111&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Tue Aug 16 20:09:43 2005
@@ -28,10 +28,6 @@
 use lib '@@INSTALLSITELIB@@';                   # substituted at 'make' time
 
 BEGIN {
-  # redirect __WARN__ and __DIE__
-  $SIG{__WARN__} = sub {
-    log_message("warn", $_[0]);
-  };
   # Locate locally installed SA libraries *without* using FindBin, which
   # generates warnings and causes more trouble than its worth.  We don't
   # need to be too smart about this BTW.
@@ -82,6 +78,14 @@
 use Mail::SpamAssassin::ArchiveIterator;
 use Mail::SpamAssassin::Util::Progress;
 use Mail::SpamAssassin::Logger qw(log_message);
+
+BEGIN {
+  # redirect __WARN__ and __DIE__, but NOT until after the
+  # Mail::SpamAssassin::Logger class has been parsed.
+  $SIG{__WARN__} = sub {
+    log_message("warn", $_[0]);
+  };
+};
 
 my %resphash = (
   EX_OK          => 0,     # no problems