From fa328676e894aab9e2f16096674aab73a230ea84 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Mon, 25 May 2015 10:28:35 +0200 Subject: [PATCH] bug in filter.py --- includes/alarmHandler.py | 3 +++ includes/filter.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/alarmHandler.py b/includes/alarmHandler.py index cf796d0..870133a 100644 --- a/includes/alarmHandler.py +++ b/includes/alarmHandler.py @@ -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]") \ No newline at end of file diff --git a/includes/filter.py b/includes/filter.py index 6de5d44..6643d54 100644 --- a/includes/filter.py +++ b/includes/filter.py @@ -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: