From: eldy <>
Date: Tue, 13 Jul 2004 22:18:16 +0000 (+0000)
Subject: Better support for qmail log files
X-Git-Tag: AWSTATS_6_3_RELEASE~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9473e2d25e952688ebaccae8f158331c57dccee5;p=thirdparty%2FAWStats.git

Better support for qmail log files
---

diff --git a/tools/maillogconvert.pl b/tools/maillogconvert.pl
index 6945fdad..f0eead2c 100644
--- a/tools/maillogconvert.pl
+++ b/tools/maillogconvert.pl
@@ -369,8 +369,8 @@ while (<>) {
 	elsif (/info msg .* from/) {
 		# Example: Sep 14 09:58:09 gandalf qmail: 1063526289.292776 info msg 270182: bytes 10712 from <john@john.do> qp 54945 uid 82
 		$MailType||='qmail';
-		#my ($id,$size,$from)=m/(\d+)(?:\.\d+)? info msg \d+: bytes (\d+) from <(.*)>/;
-		my ($id,$size,$from)=m/\d+(?:\.\d+)? info msg (\d+): bytes (\d+) from <(.*)>/;
+		#my ($id,$size,$from)=m/info msg \d+: bytes (\d+) from <(.*)>/;
+		my ($id,$size,$from)=m/info msg (\d+): bytes (\d+) from <(.*)>/;
 		$mailid=$id;
 		delete $mail{$mailid};	# If 'info msg' found, we start a new mail. This is to protect from wrong file
 		if (! $mail{$id}{'from'} || $mail{$id}{'from'} ne '<>') { $mail{$id}{'from'}=$from; }	# TODO ???