X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=amavis-logwatch;h=06b60c8d937846cdfcc39889a17aaf16a9559946;hb=15bf4096ea496a28210e2f4c1f34ab28b413566a;hp=4ad07f606ad6b53bea041bd0e408d48648500b87;hpb=bd72fdae36892f8baeee44b4a4679a8a330e5962;p=amavis-logwatch.git

diff --git a/amavis-logwatch b/amavis-logwatch
index 4ad07f6..06b60c8 100644
--- a/amavis-logwatch
+++ b/amavis-logwatch
@@ -1334,8 +1334,17 @@ sub print_summary_report (\@) {
                      $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
             }
             else {
-               push @{$lines[$cur_level]}, 
-                  sprintf "$fmt  %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
+		my $new_line;
+		if ($extra eq '') {
+		    $new_line = sprintf("$fmt  %-23s \n", $total, $desc);
+		}
+		else {
+		    $new_line = sprintf("$fmt  %-23s $extra\n",
+					$total,
+					$desc,
+					commify ($Totals{$keyname}));
+		}
+		push @{$lines[$cur_level]}, $new_line
             }
          }
       }
@@ -2035,6 +2044,8 @@ sub create_ignore_list() {
         # unanchored
    push @ignore_list_final, qr/\bRUSAGE\b/;
    push @ignore_list_final, qr/: Sending .* to UNIX socket/;
+
+   push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./
 }
 
 # Notes:
@@ -2283,7 +2294,7 @@ while (<>) {
       #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
 
       # the first IP is the envelope sender.
-      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
+      if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
          inc_unmatched('passblock');
          next;
       }