X-Git-Url: http://gitweb.michael.orlitzky.com/?p=amavis-logwatch.git;a=blobdiff_plain;f=amavis-logwatch;h=ca3e0aac0986e5a4f49cd25ec45ad9f2ec36db7d;hp=044c94d7728d023b57e88a083bdc6e465edf0e3b;hb=HEAD;hpb=6d985d29d8be2b70ee7e4048a7ae95e2b4013f17

diff --git a/amavis-logwatch b/amavis-logwatch
index 044c94d..ca3e0aa 100644
--- a/amavis-logwatch
+++ b/amavis-logwatch
@@ -1,18 +1,11 @@
 #!/usr/bin/perl -T
 
 ##########################################################################
-# Amavis-logwatch: written and maintained by:
-#
-#    Mike "MrC" Cappella <mike (at) cappella (dot) us>
-#      http://logreporters.sourceforge.net/
+# Amavis-logwatch: written by Mike Cappella, and maintained by Michael
+# Orlitzky <michael@orlitzky.com>.
 #
 # Please send all comments, suggestions, bug reports regarding this
-# program/module to the email address above.  I will respond as quickly
-# as possible. [MrC]
-#
-# Questions regarding the logwatch program itself should be directed to
-# the logwatch project at:
-#   http://sourceforge.net/projects/logwatch/support
+# program/module to the email address above.
 #
 #######################################################
 ### All work since Dec 12, 2006 (logwatch CVS revision 1.28)
@@ -27,21 +20,9 @@
 ### under your own copyright or a different license this
 ### must be explicitly stated in the contribution an the
 ### Logwatch project reserves the right to not accept such
-### contributions.  If you have made significant
-### contributions to this script and want to claim
-### copyright please contact logwatch-devel@lists.sourceforge.net.
+### contributions.
 ##########################################################
 
-##########################################################################
-# The original amavis logwatch filter was written by
-# Jim O'Halloran <jim @ kendle.com.au>, and has had many contributors over
-# the years.
-#
-# CVS log removed: see Changes file for amavis-logwatch at
-#    http://logreporters.sourceforge.net/
-# or included with the standalone amavis-logwatch distribution
-##########################################################################
-
 package Logreporters;
 use 5.008;
 use strict;
@@ -49,7 +30,7 @@ use warnings;
 no warnings "uninitialized";
 use re 'taint';
 
-our $Version         = '1.51.03';
+our $Version         = '1.51.04';
 our $progname_prefix = 'amavis';
 
 # Specifies the default configuration file for use in standalone mode.
@@ -2817,6 +2798,7 @@ while (<>) {
           ($p1 =~ /^TROUBLE/) or
           ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or
           ($p1 =~ /: Empty result from /) or
+          ($p1 =~ /: Select failed: Interrupted system call/) or
           ($p1 =~ /: Error reading from socket: Connection reset by peer/) or
           ($p1 =~ /open\(.*\): Permission denied/) or
           ($p1 =~ /^_?WARN: /) or
@@ -3212,9 +3194,10 @@ while (<>) {
       $StartInfo{'Code'}{'Not found'}{$code} = $location;
 
 
-   } elsif ( $p1 =~ /^starting\.\s+(.+) at \S+ (?:amavisd-new-|Maia Mailguard )([^,]+),/) {
+   } elsif ( $p1 =~ /^starting\.(?: \(warm\))?\s+(.+) at \S+ (?:amavis-|amavisd-new-|Maia Mailguard )([^,]+),/) {
       #TD starting.  /usr/local/sbin/amavisd at mailhost.example.com amavisd-new-2.5.0 (20070423), Unicode aware, LANG="C"
       #TD starting.  /usr/sbin/amavisd-maia at vwsw02.eon.no Maia Mailguard 1.0.2, Unicode aware, LANG=en_US.UTF-8
+      #TD starting. (warm) /usr/sbin/amavisd at mx1.example.com amavis-2.12.0 (20190725), Unicode aware, LANG="C.utf8"
       next unless ($Opts{'startinfo'});
       %StartInfo = ()  if !exists $StartInfo{'Logging'};
       $StartInfo{'ampath'}    = $1;