[Minor] Reduce number of lookups for Mailspike

1 files changed, 11 insertions, 15 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index ecb8105dc..0bab8ea51 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -537,45 +537,41 @@ metric {
             weight = 1.0;
             description = "From address is listed in UCEPROTECT LEVEL1 BL";
         }
-        symbol "RBL_MAILSPIKE" {
+        symbol "MAILSPIKE" {
             weight = 0.0;
-            description = "Unrecognised result from Mailspike blacklist";
+            description = "Unrecognised result from Mailspike";
         }
-        symbol "RWL_MAILSPIKE" {
+        symbol "RWL_MAILSPIKE_NEUTRAL" {
             weight = 0.0;
-            description = "Unrecognised result from Mailspike whitelist";
-        }
-        symbol "RBL_MAILSPIKE_ZOMBIE" {
-            weight = 2.0;
-            description = "From address is listed in RBL";
+            description = "Neutral result from Mailspike";
         }
         symbol "RBL_MAILSPIKE_WORST" {
             weight = 2.0;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - worst possible reputation";
         }
         symbol "RBL_MAILSPIKE_VERYBAD" {
             weight = 1.5;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - very bad reputation";
         }
         symbol "RBL_MAILSPIKE_BAD" {
             weight = 1.0;
-            description = "From address is listed in RBL";
+            description = "From address is listed in RBL - bad reputation";
         }
         symbol "RWL_MAILSPIKE_POSSIBLE" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - possibly legit";
         }
         symbol "RWL_MAILSPIKE_GOOD" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - good reputation";
         }
         symbol "RWL_MAILSPIKE_VERYGOOD" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - very good reputation";
         }
         symbol "RWL_MAILSPIKE_EXCELLENT" {
             weight = 0.0;
-            description = "From address is listed in RWL";
+            description = "From address is listed in RWL - excellent reputation";
         }
 
         symbol "RBL_SORBS" {