log/summarize: improve formatting so vertical

columns are consistent, regardless of when the connection is ended.
This commit is contained in:
Matt Simerson 2012-11-20 03:31:25 -05:00
parent 4a745d6baf
commit aaaf69de5c

View File

@ -80,6 +80,7 @@ while ( defined (my $line = $fh->read) ) {
next if $type ne 'connect'; # ignore unless connect next if $type ne 'connect'; # ignore unless connect
my ($host, $ip) = split /\s/, $message; my ($host, $ip) = split /\s/, $message;
$ip = substr $ip, 1, -1; $ip = substr $ip, 1, -1;
foreach ( keys %seen_plugins, qw/ helo_host from to / ) { $pids{$pid}{$_} = ''; };
$pids{$pid}{ip} = $ip; $pids{$pid}{ip} = $ip;
$pids{$pid}{hostname} = $host if $host ne 'Unknown'; $pids{$pid}{hostname} = $host if $host ne 'Unknown';
}; };
@ -231,11 +232,11 @@ sub print_auto_format {
$seen_plugins{$plugin}++; $seen_plugins{$plugin}++;
}; };
next if ! $seen_plugins{$plugin}; # hide plugins not used next if ! $seen_plugins{$plugin}; # hide unused plugins
if ( $hide_plugins{$plugin} ) { # user doesn't want to see if ( $hide_plugins{$plugin} ) { # user doesn't want to see
delete $pids{$pid}{$plugin}; delete $pids{$pid}{$plugin};
next; next;
}; };
if ( defined $pids{$pid}{helo_host} && $plugin =~ /helo/ ) { if ( defined $pids{$pid}{helo_host} && $plugin =~ /helo/ ) {
$format .= " %-18.18s"; $format .= " %-18.18s";