svn commit: r164691 - /spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm

[qu...@apache.org]

Author: quinlan
Date: Mon Apr 25 16:49:05 2005
New Revision: 164691

URL: http://svn.apache.org/viewcvs?rev=164691&view=rev
Log:
preserve leading whitespace in logging (useful for Data::Dumper)

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm?rev=164691&r1=164690&r2=164691&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm Mon Apr 25 16:49:05 2005
@@ -122,13 +122,16 @@
   _log("info", @_);
 }
 
+# remember to avoid deep recursion, my friend
 sub _log {
   my ($level, $message) = @_;
 
   my $facility = "generic";
-  if ($message =~ /^(\S+?):\s*(.*)/s) {
+  my $whitespace = " ";
+  if ($message =~ /^(\S+?):(\s*)(.*)/s) {
     $facility = $1;
-    $message = $2;
+    $whitespace = $2 if $2;
+    $message = $3;
   }
 
   # only debug specific facilities
@@ -139,7 +142,7 @@
   }
 
   $message =~ s/\n+$//s;
-  $message =~ s/^/${facility}: /mg;
+  $message =~ s/^/${facility}:${whitespace}/mg;
 
   # no reason to go through warn()
   log_message($level, $message);