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

spamassassin: further log message refinement

Browse Source
This commit is contained in:
Matt Simerson 2012-06-27 20:18:16 -04:00 committed by Matt Simerson
parent a005f131f3
commit ab22cb2ac4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/spamassassin
View File

@ -369,11 +369,12 @@ sub reject {
my ($self, $transaction) = @_; my ($self, $transaction) = @_;
my $sa_results = $self->get_spam_results($transaction) or do { my $sa_results = $self->get_spam_results($transaction) or do {
$self->log(LOGNOTICE, "skip, no results"); $self->log(LOGNOTICE, "error, no results");
return DECLINED; return DECLINED;
}; };
my $score = $sa_results->{score} or do { my $score = $sa_results->{score};
$self->log(LOGERROR, "skip, error getting score"); if ( ! defined $score ) {
$self->log(LOGERROR, "error, error getting score");
return DECLINED; return DECLINED;
}; };
@ -385,7 +386,7 @@ sub reject {
}; };
my $reject = $self->{_args}{reject} or do { my $reject = $self->{_args}{reject} or do {
$self->log(LOGERROR, "skip, reject disabled ($status, $learn)"); $self->log(LOGERROR, "pass, reject disabled ($status, $learn)");
return DECLINED; return DECLINED;
}; };
@ -400,7 +401,7 @@ sub reject {
} }
} }
$self->connection->notes('karma', $self->connection->notes('karma') - 1); $self->connection->notes('karma', ($self->connection->notes('karma') - 1));
# default of media_unsupported is DENY, so just change the message # default of media_unsupported is DENY, so just change the message
$self->log(LOGINFO, "fail, $status, > $reject, $learn"); $self->log(LOGINFO, "fail, $status, > $reject, $learn");
return ($self->get_reject_type(), "spam score exceeded threshold"); return ($self->get_reject_type(), "spam score exceeded threshold");