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

[mm...@apache.org]

Author: mmartinec
Date: Sat Jul 30 00:35:54 2011
New Revision: 1152404

URL: http://svn.apache.org/viewvc?rev=1152404&view=rev
Log:
Bug 6642: unknown facility/priority - try to catch and report bad priority

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm?rev=1152404&r1=1152403&r2=1152404&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm Sat Jul 30 00:35:54 2011
@@ -39,9 +39,16 @@ use Time::HiRes ();
 use Sys::Syslog qw(:DEFAULT setlogsock);
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
+use vars qw(@ISA %prio_map);
 @ISA = ();
 
+BEGIN {
+  %prio_map = (dbg => 'debug', debug => 'debug', info => 'info',
+               notice => 'notice', warn => 'warning', warning => 'warning',
+               error => 'err', err => 'err', crit => 'crit', alert => 'alert',
+               emerg => 'emerg');
+}
+
 sub new {
   my $class = shift;
 
@@ -128,10 +135,11 @@ sub log_message {
   return if $self->{disabled};
 
   # map level names
-  # info is already info
-  $level = 'debug' if $level eq 'dbg';
-  $level = 'warning' if $level eq 'warn';
-  $level = 'err' if $level eq 'error';
+  $level = $prio_map{$level};
+  if (!defined $level) {  # just in case
+    $level = 'err';
+    $msg = '(bad prio: ' . $_[1] . ') ' . $msg;
+  }
 
   # install a new handler for SIGPIPE -- this signal has been
   # found to occur with syslog-ng after syslog-ng restarts.