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

karma_tool: release didn't. fixed.

Browse Source 
also, preserve karma history when using karma_tool to capture/release
This commit is contained in:
Matt Simerson 2013-03-11 00:24:11 -04:00
parent 0ed418fafd
commit dd59ad210e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/karma_tool
View File

@ -21,7 +21,7 @@ elsif ( $command eq 'capture' ) {
$self->capture( $ARGV[1] ); $self->capture( $ARGV[1] );
} }
elsif ( $command eq 'release' ) { elsif ( $command eq 'release' ) {
$self->capture( $ARGV[1] ); $self->release( $ARGV[1] );
} }
elsif ( $command eq 'prune' ) { elsif ( $command eq 'prune' ) {
$self->prune_db( $ARGV[1] || 7 ); $self->prune_db( $ARGV[1] || 7 );
@ -67,7 +67,9 @@ sub capture {
my $tied = $self->get_db_tie( $db, $lock ) or return; my $tied = $self->get_db_tie( $db, $lock ) or return;
my $key = $self->get_db_key( $ip ); my $key = $self->get_db_key( $ip );
$tied->{$key} = join(':', time, 1, 0, 1); my ($penalty_start_ts, $naughty, $nice, $connects) = split /:/, $tied->{$key};
$tied->{$key} = join(':', time, $naughty+1, $nice, $connects);
return $self->cleanup_and_return( $tied, $lock ); return $self->cleanup_and_return( $tied, $lock );
}; };
@ -84,7 +86,9 @@ sub release {
my $tied = $self->get_db_tie( $db, $lock ) or return; my $tied = $self->get_db_tie( $db, $lock ) or return;
my $key = $self->get_db_key( $ip ); my $key = $self->get_db_key( $ip );
$tied->{$key} = join(':', 0, 1, 0, 1); my ($penalty_start_ts, $naughty, $nice, $connects) = split /:/, $tied->{$key};
$tied->{$key} = join(':', 0, 0, $nice, $connects);
return $self->cleanup_and_return( $tied, $lock ); return $self->cleanup_and_return( $tied, $lock );
}; };
@ -124,7 +128,7 @@ sub main {
}; };
my $hostname = ''; my $hostname = '';
if ( $naughty && $nice ) { if ( $naughty && $nice ) {
$hostname = `dig +short -x $ip`; chomp $hostname; #$hostname = `dig +short -x $ip`; chomp $hostname;
}; };
printf(" %-18s %24s %3s %3s %3s %30s\n", $ip, $time_human, $naughty, $nice, $connects, $hostname); printf(" %-18s %24s %3s %3s %3s %30s\n", $ip, $time_human, $naughty, $nice, $connects, $hostname);
$totals{naughty} += $naughty if $naughty; $totals{naughty} += $naughty if $naughty;