Apply changes to aggregate salt messages

modules/ffpb.py

@@ -77,6 +77,19 @@ class MsgHandler(SocketServer.BaseRequestHandler):
             msg_cache[msg]['nodes'].append (sender)
             return
 
+        # Aggregate identical salt changes reported from different hosts
+        match = re.search ("^(\S+): (.*)$", msg)
+        if sender == "salt" and match:
+            salt_msg = match.group (2)
+            if salt_msg not in msg_cache:
+                msg_cache[salt_msg] = {
+                    'time' : time.time (),
+                    'nodes' : []
+                }
+
+            msg_cache[salt_msg]['nodes'].append (match.group (1))
+            return
+
         bot.msg(target, "[{0}] {1}".format(sender, msg))
 
 

modules/ffpb_netstatus.py

@@ -43,7 +43,7 @@ def shutdown(bot):
         highscores = None
 
 
-@willie.module.interval(5)
+@willie.module.interval(15)
 def ffpb_get_stats(bot):
     """Fetch current statistics, if the highscore changes signal this."""