amavis-logwatch: support forthcoming amavis-2.12.0 "starting" format.

[amavis-logwatch.git] / amavis-logwatch

diff --git a/amavis-logwatch b/amavis-logwatch
index 912839ec2a38ec44ff50454be125bae5511963cd..ca3e0aac0986e5a4f49cd25ec45ad9f2ec36db7d 100644 (file)
--- a/amavis-logwatch
+++ b/amavis-logwatch
@@ -3194,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;