bug in filter.py

This commit is contained in:
Bastian Schroll 2015-05-25 10:28:35 +02:00
parent 42384407ce
commit fa328676e8
2 changed files with 4 additions and 1 deletions

View file

@ -8,6 +8,7 @@ from includes import globals # Global variables
def processAlarm(typ,freq,data):
logging.debug("[ ALARM ]")
for pluginName, plugin in globals.pluginList.items():
#if enabled use RegEx-Filter
if globals.config.getint("BOSWatch","useRegExFilter"):
from includes import filter
@ -15,8 +16,10 @@ def processAlarm(typ,freq,data):
logging.debug("call Plugin: %s", pluginName)
plugin.run(typ,freq,data)
logging.debug("return from: %s", pluginName)
else:
logging.debug("call Plugin: %s", pluginName)
plugin.run(typ,freq,data)
logging.debug("return from: %s", pluginName)
logging.debug("[END ALARM]")

View file

@ -26,7 +26,7 @@ def checkFilters(data,typ,plugin):
#extract the correct data for filtering
if typ == "FMS": data = data["fms"]
if typ == "ZVEI": data = data["zvei"]
if typ == "POC": data = data["poc"]
if typ == "POC": data = data["ric"]
foundFilter = False
for i in globals.filterList: