ENH: print rebans stats even if no "Failures" are logged, and reduce indentation in output

pull/782/head
Yaroslav Halchenko 10 years ago
parent decea64cf9
commit b1c04f5fa2

@ -143,7 +143,7 @@ while (defined(my $ThisLine = <STDIN>)) {
if (keys %ServicesBans) { if (keys %ServicesBans) {
printf("\nBanned services with Fail2Ban: Bans:Unbans:Hits\n"); printf("\nBanned services with Fail2Ban: Bans:Unbans:Hits\n");
foreach my $service (sort {$a cmp $b} keys %ServicesBans) { foreach my $service (sort {$a cmp $b} keys %ServicesBans) {
printf(" %-55s [%3d:%d:%-3d]\n", "$service:", printf(" %-55s [%3d:%d:%-3d]\n", "$service:",
$ServicesBans{$service}{'(all)'}{'Ban'}, $ServicesBans{$service}{'(all)'}{'Ban'},
$ServicesBans{$service}{'(all)'}{'Unban'}, $ServicesBans{$service}{'(all)'}{'Unban'},
$ServicesBans{$service}{'(all)'}{'Hit'}); $ServicesBans{$service}{'(all)'}{'Hit'});
@ -152,7 +152,7 @@ if (keys %ServicesBans) {
if ($Detail >= 5) { if ($Detail >= 5) {
foreach my $ip (sort $totalSort keys %{$ServicesBans{$service}}) { foreach my $ip (sort $totalSort keys %{$ServicesBans{$service}}) {
my $name = LookupIP($ip); my $name = LookupIP($ip);
printf(" %-53s %3d:%d:%-3d\n", printf(" %-53s %3d:%d:%-3d\n",
$name, $name,
$ServicesBans{$service}{$ip}{'Ban'}, $ServicesBans{$service}{$ip}{'Ban'},
$ServicesBans{$service}{$ip}{'Unban'}, $ServicesBans{$service}{$ip}{'Unban'},
@ -162,10 +162,13 @@ if (keys %ServicesBans) {
foreach my $fails (@{$ServicesBans{$service}{$ip}{'Failures'}}) { foreach my $fails (@{$ServicesBans{$service}{$ip}{'Failures'}}) {
print " $fails"; print " $fails";
} }
print " times"; print " times\n";
printf("\n %d Duplicate Ban attempts", $ServicesBans{$service}{$ip}{'AlreadyInTheList'}) ; }
printf("\n %d ReBans due to rules reinitilizations", $ServicesBans{$service}{$ip}{'ReBan'}) ; if ($ServicesBans{$service}{$ip}{'AlreadyInTheList'}>0) {
print "\n"; printf(" %d Duplicate Ban attempt(s)\n", $ServicesBans{$service}{$ip}{'AlreadyInTheList'}) ;
}
if ($ServicesBans{$service}{$ip}{'ReBan'}>0) {
printf(" %d ReBan(s) due to rules reinitilizations\n", $ServicesBans{$service}{$ip}{'ReBan'}) ;
} }
} }
} }

Loading…
Cancel
Save