33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
Index: scripts/services/dovecot
|
|
===================================================================
|
|
--- scripts/services/dovecot (revision 85)
|
|
+++ scripts/services/dovecot (working copy)
|
|
@@ -121,7 +121,7 @@
|
|
# We don't care about these
|
|
} elsif ( $ThisLine =~ /Killed with signal /) {
|
|
$End++;
|
|
- } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(core dumps disabled\))?$/) {
|
|
+ } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(.*\))?$/) {
|
|
$Restarts++;
|
|
$End = 0;
|
|
} elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) {
|
|
@@ -147,15 +147,16 @@
|
|
}
|
|
|
|
# 'lda' for dovecot 2.0, 'deliver' for earlier versions
|
|
- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): msgid=.*: saved mail to (\S+)/ ) ) {
|
|
+ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): msgid=.*: saved mail to (.*)/ ) ) {
|
|
$Deliver{$User}{$Mailbox}++;
|
|
|
|
# For Sieve-based delivery
|
|
} elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda\(|deliver\(|lmtp\(\d+, )(.*)\): (?:[^:]+: )?sieve: msgid=.*: stored mail into mailbox '(\S+)'/ ) ) {
|
|
+ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) {
|
|
$Deliver{$User}{$Mailbox}++;
|
|
|
|
# LMTP-based delivery
|
|
- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag lmtp\(\d+, (.*)\): [^:]+: msgid=.*: saved mail to (\S+)/ ) ) {
|
|
+ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag lmtp\(\d+, (.*)\): [^:]+: msgid=.*: saved mail to (.*)/ ) ) {
|
|
# dovecot: [ID 583609 mail.info] lmtp(12782, cloyce@headgear.org): jBt1EfjCMk3uMQAAm9eMBA: msgid=<4D32DB1F.3080707@c-dot.co.uk>: saved mail to INBOX
|
|
$Deliver{$User}{$Mailbox}++;
|
|
|