Skip to content
Snippets Groups Projects
Commit 40aba3e8 authored by deuce's avatar deuce
Browse files

Log warnings first since both may be present.

parent cf7a2445
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
exec/spamc.js
+ 4
− 4
View file @ 40aba3e8
...@@ -48,23 +48,23 @@ function main() ...@@ -48,23 +48,23 @@ function main()
msg.debug=true; msg.debug=true;
log(LOG_INFO, "spamc: Executing command: " + cmd); log(LOG_INFO, "spamc: Executing command: " + cmd);
var ret=msg.DoCommand(cmd); var ret=msg.DoCommand(cmd);
if(ret.warning != undefined)
log(LOG_WARNING, "spamc: WARNING "+ret.warning);
if(ret.error != undefined) { if(ret.error != undefined) {
log(LOG_ERR,"spamc: !ERROR "+ret.error); log(LOG_ERR,"spamc: !ERROR "+ret.error);
return; return;
} }
if(ret.warning != undefined)
log(LOG_WARNING, "spamc: WARNING "+ret.warning);
if(!isNaN(ret.score)) { if(!isNaN(ret.score)) {
log(LOG_INFO, "spamc: Score: " + ret.score + ' / ' + ret.threshold); log(LOG_INFO, "spamc: Score: " + ret.score + ' / ' + ret.threshold);
if(threshold && ret.score < threshold) { if(threshold && ret.score < threshold) {
var ret=msg.DoCommand(cmd='PROCESS'); var ret=msg.DoCommand(cmd='PROCESS');
if(ret.warning != undefined)
log(LOG_WARNING, "spamc: WARNING "+ret.warning);
if(ret.error != undefined) { if(ret.error != undefined) {
log(LOG_ERR,"spamc: !ERROR "+ret.error); log(LOG_ERR,"spamc: !ERROR "+ret.error);
return; return;
} }
if(ret.warning != undefined)
log(LOG_WARNING, "spamc: WARNING "+ret.warning);
} }
} }
if(cmd == 'PROCESS') { if(cmd == 'PROCESS') {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment