From 4104cd1776e4fb5190d7f610c7a0396ca2e18a78 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 9 Jan 2009 04:17:36 +0000
Subject: [PATCH] No longer need to process twice when using threshold feature.
---
exec/spamc.js | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/exec/spamc.js b/exec/spamc.js
index af1898410d..b2d640666e 100644
--- a/exec/spamc.js
+++ b/exec/spamc.js
@@ -55,19 +55,9 @@ function main()
return;
}
- if(!isNaN(ret.score)) {
- log(LOG_INFO, "spamc: Score: " + ret.score + ' / ' + ret.threshold);
- if(threshold && ret.score < threshold) {
- var ret=msg.DoCommand(cmd='PROCESS');
- if(ret.warning != undefined)
- log(LOG_WARNING, "spamc: WARNING "+ret.warning);
- if(ret.error != undefined) {
- log(LOG_ERR,"spamc: !ERROR "+ret.error);
- return;
- }
- }
- }
- if(cmd == 'PROCESS') {
+ log(LOG_INFO, "spamc: Score: " + ret.score + ' / ' + ret.threshold);
+
+ if(cmd == 'PROCESS' || (threshold && ret.score < threshold)) {
var msg_file = new File(message_text_filename);
if(!msg_file.open("w")) {
log(LOG_ERR,format("spamc: !ERROR %d opening message text file: %s"
@@ -80,6 +70,7 @@ function main()
}
if(!ret.isSpam)
return;
+ log(LOG_INFO, "spamc: rejecting SPAM with SMTP error");
var error_file = new File(processing_error_filename);
if(!error_file.open("w")) {
log(LOG_ERR,format("spamc: !ERROR %d opening processing error file: %s"
--
GitLab