courier: courierfilter lines

1 files changed, 20 insertions, 2 deletions

diff --git a/courier b/courier
index 0ac68d0..b175d01 100644
--- a/courier
+++ b/courier
@@ -354,6 +354,7 @@ my %ErrorTbl2;
 my %Failed;
 my %FailRe;
 my $From;
+my $GreylistReject = 0;
 my $Host;
 my $ID;
 my $LastSMTPErrCode;
@@ -553,10 +554,23 @@ while (defined($ThisLine = <STDIN>)) {
          PushUnmatched $service, $ThisLine;
       }
    } elsif ( $service =~ /^courierfilter$/ ) {
-      if ( $ThisLine =~ /^Starting perlfilter/ ) {
+      if ( $ThisLine =~ /^Starting p(erl|ython)filter/ ) {
          $Startpfilter++;
-      } elsif ( $ThisLine =~ /^Stopping perlfilter/ ) {
+      } elsif ( $ThisLine =~ /^Stopping p(erl|ython)filter/ ) {
          $Stoppfilter++;
+      } elsif ( $ThisLine =~ /^pythonfilter greylist reject/ ) {
+         $GreylistReject++;
+      } elsif (
+         ( $ThisLine =~ /^Initialized the \S+ python filter$/ ) or
+         ( $ThisLine =~ /^Debugging filter invoked:$/ ) or
+         ( $ThisLine =~ /^E?[GPU]ID: \d+$/ ) or
+         ( $ThisLine =~ /^Additional groups: / ) or
+         ( $ThisLine =~ /^Body: / ) or
+         ( $ThisLine =~ /^Control file: / ) or
+         ( $ThisLine =~ /^CWD: / ) or
+         ( $ThisLine =~ /^Raw stat: / ) or
+         0
+      ) {
       } else {
          PushUnmatched $service, $ThisLine;
       }
@@ -641,6 +655,10 @@ if ( keys %ConnTimeout ) {
    print $out."\n";
 }
 
+if ( ( $Detail >= 5 ) and ($GreylistReject) ) {
+   print "\nGreylisted Emails: ".nTimes($GreylistReject)."\n";
+}
+
 if ( ( $Detail >= 5 ) and (keys %Connection) and (!$Tables)) {
    my ($out, $nmb) = recprint1(\%Connection, 2, [ "Protocol", "Host" ], [0,1], 2);
    print "\nConnections: ".nTimes($nmb)."\n";