Minor update for Issues #292 & #293 (only single alert per target)

stamparm · stamparm · commit a54c261496a1 · 2012-12-11T14:44:43.000+01:00
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
@@ -521,15 +521,18 @@ def genCmpPayload():
                         injection.conf.regexp = conf.regexp
                         injection.conf.optimize = conf.optimize
 
-                        if conf.beep:
-                            beep()
+                        if not kb.alerted:
+                            if conf.beep:
+                                beep()
 
-                        if conf.alert:
-                            infoMsg = "executing alerting shell command(s) ('%s')" % conf.alert
-                            logger.info(infoMsg)
+                            if conf.alert:
+                                infoMsg = "executing alerting shell command(s) ('%s')" % conf.alert
+                                logger.info(infoMsg)
+
+                                process = execute(conf.alert, shell=True)
+                                process.wait()
 
-                            process = execute(conf.alert, shell=True)
-                            process.wait()
+                            kb.alerted = True
 
                         # There is no need to perform this test for other
                         # <where> tags
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1480,6 +1480,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
 
     kb.absFilePaths = set()
     kb.adjustTimeDelay = None
+    kb.alerted = False
     kb.alwaysRefresh = None
     kb.arch = None
     kb.authHeader = None
