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

[mm...@apache.org]

Author: mmartinec
Date: Tue Feb 16 15:16:07 2010
New Revision: 910554

URL: http://svn.apache.org/viewvc?rev=910554&view=rev
Log:
Bug 6329 - POSIX::strftime in call under Win32 ActivePerl causes Perl to hang up;
formatting option %e is not in a POSIX standard, use %d instead and edit

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Stderr.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Stderr.pm?rev=910554&r1=910553&r2=910554&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Stderr.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Stderr.pm Tue Feb 16 15:16:07 2010
@@ -54,13 +54,12 @@
   my ($self, $level, $msg) = @_;
 
   my $now = Time::HiRes::time;
-  printf STDERR ("%s:%06.3f [%d] %s: %s\n",
-    POSIX::strftime("%b %e %H:%M",localtime($now)), $now-int($now/60)*60,
-    $$, $level, $msg)  or warn "Error writing to log file: $!";
-
-# print STDERR "[$$] $level: $msg\n"
-#   or warn "Error writing to log file: $!";
-
+  my $timestamp = sprintf("%s:%06.3f",
+    POSIX::strftime("%b %d %H:%M",localtime($now)), $now-int($now/60)*60);
+  # Bug 6329: %e is not in a POSIX standard, use %d instead and edit
+  local $1; $timestamp =~ s/^(\S+\s+)0/$1 /;
+  printf STDERR ("%s [%d] %s: %s\n",
+    $timestamp, $$, $level, $msg)  or warn "Error writing to log file: $!";
 }
 
 sub close_log {