Silence errors; yield unknown results from RBLs; fix scoring for DNSWL

1 files changed, 19 insertions, 10 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 34ae60ec0..df69919eb 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -520,33 +520,33 @@ metric {
 	symbol {
 	    name = "RCVD_IN_DNSWL";
 	    weight = 0.0;
-	    description = "Sender listed at http://www.dnswl.org";
+	    description = "Unrecognised result from dnswl.org";
 	}
 	symbol {
 	    name = "RCVD_IN_DNSWL_NONE";
-	    weight = -0.05;
+	    weight = 0.0;
 	    description = "Sender listed at http://www.dnswl.org, low none";
 	}
 	symbol {
 	    name = "RCVD_IN_DNSWL_LOW";
-	    weight = -0.1;
+	    weight = 0.0;
 	    description = "Sender listed at http://www.dnswl.org, low trust";
 	}
 	symbol {
 	    name = "RCVD_IN_DNSWL_MED";
-	    weight = -1.0;
+	    weight = 0.0;
 	    description = "Sender listed at http://www.dnswl.org, medium trust";
 	}
 	symbol {
 	    name = "RCVD_IN_DNSWL_HI";
-	    weight = -5.0;
+	    weight = 0.0;
 	    description = "Sender listed at http://www.dnswl.org, high trust";
 	}
 
 	symbol {
 	    name = "RBL_SPAMHAUS";
 	    weight = 0.0;
-	    description = "From address is listed in zen";
+	    description = "Unrecognised result from Spamhaus zen";
 	}
 	symbol {
 	    name = "RBL_SPAMHAUS_SBL";
@@ -578,7 +578,7 @@ metric {
 	symbol {
 	    name = "RWL_SPAMHAUS_WL";
 	    weight = 0.0;
-	    description = "Sender listed at Spamhaus whitelist";
+	    description = "Unrecognised result from Spamhaus whitelist";
 	}
 	symbol {
 	    name = "RWL_SPAMHAUS_WL_IND";
@@ -616,7 +616,16 @@ metric {
 	    description = "From address is listed in UCEPROTECT LEVEL1 BL";
 	    name = "RBL_UCEPROTECT_LEVEL1";
 	}
-
+	symbol {
+	    name = "RBL_MAILSPIKE";
+	    weight = 0.0;
+	    description = "Unrecognised result from Mailspike blacklist";
+	}
+	symbol {
+	    name = "RWL_MAILSPIKE";
+	    weight = 0.0;
+	    description = "Unrecognised result from Mailspike blacklist";
+	}
 	symbol {
 	    name = "RBL_MAILSPIKE_ZOMBIE";
 	    weight = 2.0;
@@ -659,9 +668,9 @@ metric {
 	}
 
 	symbol {
-	    weight = 1.0;
+	    weight = 0.0;
 	    name = "RBL_SORBS";
-	    description = "From address is listed in SORBS RBL";
+	    description = "Unrecognised result from SORBS RBL";
 	}
 	symbol {
 	    weight = 2.5;