byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log/summarize: narrower column when no geoip city data present

Browse Source
This commit is contained in:
Matt Simerson 2012-06-30 17:51:59 -04:00
parent 3145a3713b
commit 17abbfe1b0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
log/summarize
View File

@ -25,7 +25,6 @@ my %formats = (
ip => "%-15.15s", ip => "%-15.15s",
hostname => "%-20.20s", hostname => "%-20.20s",
distance => "%5.5s", distance => "%5.5s",
'ident::geoip' => "%-20.20s", 'ident::geoip' => "%-20.20s",
'ident::p0f' => "%-10.10s", 'ident::p0f' => "%-10.10s",
count_unrecognized_commands => "%-5.5s", count_unrecognized_commands => "%-5.5s",
@ -109,10 +108,16 @@ while ( defined (my $line = $fh->read) ) {
}; };
if ( $plugin eq 'ident::geoip' ) { if ( $plugin eq 'ident::geoip' ) {
my ($gip, $distance) = $message =~ /(.*?),\s+([\d]+)\skm/; if ( length $message < 3 ) {
if ( $distance ) { $formats{'ident::geoip'} = "%-3.3s";
$pids{$pid}{$plugin} = $gip; $formats3{'ident::geoip'} = "%-3.3s";
$pids{$pid}{distance} = $distance; }
else {
my ($gip, $distance) = $message =~ /(.*?),\s+([\d]+)\skm/;
if ( $distance ) {
$pids{$pid}{$plugin} = $gip;
$pids{$pid}{distance} = $distance;
};
}; };
}; };
} }
@ -234,12 +239,12 @@ sub print_auto_format {
if ( defined $pids{$pid}{helo_host} && $plugin =~ /helo/ ) { if ( defined $pids{$pid}{helo_host} && $plugin =~ /helo/ ) {
$format .= " %-18.18s"; $format .= " %-18.18s";
push @values, delete $pids{$pid}{helo_host}; push @values, substr( delete $pids{$pid}{helo_host}, -18, 18);
push @headers, 'HELO'; push @headers, 'HELO';
} }
elsif ( defined $pids{$pid}{from} && $plugin =~ /from/ ) { elsif ( defined $pids{$pid}{from} && $plugin =~ /from/ ) {
$format .= " %-20.20s"; $format .= " %-20.20s";
push @values, delete $pids{$pid}{from}; push @values, substr( delete $pids{$pid}{from}, -20, 20);
push @headers, 'MAIL FROM'; push @headers, 'MAIL FROM';
} }
elsif ( defined $pids{$pid}{to} && $plugin =~ /to|rcpt|recipient/ ) { elsif ( defined $pids{$pid}{to} && $plugin =~ /to|rcpt|recipient/ ) {