INN commit: branches/2.5 (2 files)
INN Commit
rra at isc.org
Sat Jul 18 13:10:14 UTC 2009
Date: Saturday, July 18, 2009 @ 06:10:14
Author: iulius
Revision: 8553
Log a checkgroups only once in innreport. Now that all
control.ctl matching lines are used, they were all logged
by innreport as a checkgroups. We only count for several
doit actions.
Modified:
branches/2.5/control/controlchan.in
branches/2.5/scripts/innreport_inn.pm
--------------------------+
control/controlchan.in | 2 ++
scripts/innreport_inn.pm | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: control/controlchan.in
===================================================================
--- control/controlchan.in 2009-07-18 13:09:36 UTC (rev 8552)
+++ control/controlchan.in 2009-07-18 13:10:14 UTC (rev 8553)
@@ -175,7 +175,9 @@
next;
}
+ # Count a control article only once.
my $approved = $hdr{'approved'} ? 1 : 0;
+ $approved = -1 if $i > 0;
logmsg("$subname, " . join(' ', @progparams)
. " $sender $replyto $token, $exclusionpats, $droppats,"
. " $charset_to, $sitepath, $action"
Modified: scripts/innreport_inn.pm
===================================================================
--- scripts/innreport_inn.pm 2009-07-18 13:09:36 UTC (rev 8552)
+++ scripts/innreport_inn.pm 2009-07-18 13:10:14 UTC (rev 8553)
@@ -2003,7 +2003,7 @@
}
return 1;
}
- # control_XXgroup, foo.bar [moderated] who who /x/y/12, peer, action, 1
+ # control_XXgroup, foo.bar [moderated] who who token, [pattern], [pattern], encoding, peer, action, 1
#
# Various other random junk can end up in the moderated field, like y,
# unmoderated, m, etc. depending on what the control message says. It
@@ -2013,23 +2013,23 @@
(\s\S+)? # optional
\s(\S+) # e-mail
\s\S+ # e-mail
- \s\S+, # filename
+ \s\S+, # storage token
\s(?:\S+)?, # exclusion pattern
\s(?:\S+)?, # drop pattern
\s\S+, # local encoding
\s\S+, # server
\s([^=,]+(?:=\S+)?), # action
- \s*(.*) # code
+ \s*(.*) # 1 if message approved and first logged in the file
/x) {
if ($1 eq 'newgroup') {
$controlchan_new{$3}++;
} elsif ($1 eq 'rmgroup') {
$controlchan_rm{$3}++;
} else {
- $controlchan_other{$3}++;
+ $controlchan_other{$3}++ if $5 >= 0;
}
$controlchan_who{$3}++;
- $controlchan_ok{$3} += $5;
+ $controlchan_ok{$3} += $5 if $5 > 0;
my $action = $4;
my $email = $3;
$action =~ s/=.*//;
More information about the inn-committers
mailing list